diff --git a/web/zm_html_config.php b/web/zm_html_config.php
index b18789c3b..ab8aa62be 100644
--- a/web/zm_html_config.php
+++ b/web/zm_html_config.php
@@ -111,7 +111,8 @@ $jws = array(
 	'controlcaps' => array( 'w'=>700, 'h'=>320 ),
 	'controlcap' => array( 'w'=>360, 'h'=>440 ),
 	'cycle' => array( 'w'=>16, 'h'=>32 ),
-	'device' => array( 'w'=>196, 'h'=>164 ),
+	'device' => array( 'w'=>260, 'h'=>120 ),
+	'devices' => array( 'w'=>400, 'h'=>240 ),
 	'donate' => array( 'w'=>500, 'h'=>280 ),
 	'event' => array( 'w'=>96, 'h'=>168 ),
 	'eventdetail' => array( 'w'=>400, 'h'=>220 ),
diff --git a/web/zm_html_view_console.php b/web/zm_html_view_console.php
index 94c03954e..23f4c9df7 100644
--- a/web/zm_html_view_console.php
+++ b/web/zm_html_view_console.php
@@ -226,6 +226,8 @@ newWindow( '<?= $PHP_SELF ?>?view=donate', 'zmDonate', <?= $jws['donate']['w'] ?
 <td class="smallhead" align="right"><?= $zmSlangLoad ?>: <?= getLoad() ?> / <?= $zmSlangDisk ?>: <?= getDiskPercent() ?>%</td>
 </tr>
 <tr>
+<td class="smallhead" align="left"><table width="100%" border="0" cellpadding="0" cellspacing="0"><tr><td class="smallhead" align="left">
+<tr>
 <td class="smallhead" align="left">
 <?php
 if ( canView( 'System' ) )
@@ -243,6 +245,18 @@ else
 ?>
 </td>
 <?php
+if ( ZM_OPT_X10 && canView('Devices' ) )
+{
+?>
+<td class="smallhead" align="right"><a href="javascript: newWindow( '<?= $PHP_SELF ?>?view=devices', 'zmDevices', <?= $jws['devices']['w'] ?>, <?= $jws['devices']['h'] ?> );"><?= $zmSlangDevices ?></a></td>
+<?php
+}
+?>
+</td>
+</tr>
+</table>
+</td>
+<?php
 if ( ZM_OPT_USE_AUTH )
 {
 ?>
diff --git a/web/zm_lang_en_gb.php b/web/zm_lang_en_gb.php
index 8eaee04e8..25d0c698a 100644
--- a/web/zm_lang_en_gb.php
+++ b/web/zm_lang_en_gb.php
@@ -239,6 +239,7 @@ $zmSlangDeviceChannel        = 'Device Channel';
 $zmSlangDeviceFormat         = 'Device Format';
 $zmSlangDeviceNumber         = 'Device Number';
 $zmSlangDevicePath           = 'Device Path';
+$zmSlangDevices              = 'Devices';
 $zmSlangDimensions           = 'Dimensions';
 $zmSlangDisableAlarms        = 'Disable Alarms';
 $zmSlangDisk                 = 'Disk';
@@ -340,6 +341,7 @@ $zmSlangInclude              = 'Include';
 $zmSlangIn                   = 'In';
 $zmSlangInverted             = 'Inverted';
 $zmSlangIris                 = 'Iris';
+$zmSlangKeyString            = 'Key String';
 $zmSlangLabel                = 'Label';
 $zmSlangLanguage             = 'Language';
 $zmSlangLast                 = 'Last';
@@ -453,6 +455,8 @@ $zmSlangNoSavedFilters       = 'NoSavedFilters';
 $zmSlangNoStatisticsRecorded = 'There are no statistics recorded for this event/frame';
 $zmSlangNotes                = 'Notes';
 $zmSlangNumPresets           = 'Num Presets';
+$zmSlangOff                  = 'Off';
+$zmSlangOn                   = 'On';
 $zmSlangOpen                 = 'Open';
 $zmSlangOpEq                 = 'equal to';
 $zmSlangOpGtEq               = 'greater than or equal to';
diff --git a/web/zm_xhtml_view_console.php b/web/zm_xhtml_view_console.php
index 79bc81b51..bd29d43fd 100644
--- a/web/zm_xhtml_view_console.php
+++ b/web/zm_xhtml_view_console.php
@@ -128,7 +128,20 @@ foreach( $monitors as $monitor )
 }
 ?>
 <tr>
+<?php
+if ( ZM_OPT_X10 )
+{
+?>
+<td align="left"><?= makeLink( "$PHP_SELF?view=devices", $zmSlangDevices, canView('Devices' ) ) ?></td>
+<?php
+}
+else
+{
+?>
 <td align="left">&nbsp;</td>
+<?php
+}
+?>
 <td align="center"><?= makeLink( "$PHP_SELF?view=montage", count($monitors), ( $running && canView( 'Stream' ) && $cycle_count > 1 ) ) ?></td>
 <td align="right"><?= makeLink( "$PHP_SELF?view=events&amp;page=1&amp;filter=1&amp;trms=2&amp;attr1=Archived&amp;op1=%3d&amp;val1=0&amp;cnj2=and&amp;attr2=DateTime&amp;op2=%3e%3d&amp;val2=-1%20hour", $hour_event_count, canView( 'Events' ) ) ?></td>
 <td align="right"><?= makeLink( "$PHP_SELF?view=events&amp;page=1&amp;filter=1&amp;trms=2&amp;attr1=Archived&amp;op1=%3d&amp;val1=0&amp;cnj2=and&amp;attr2=Date&amp;op2=%3e%3d&amp;val2=today", $today_event_count, canView( 'Events' ) ) ?></td>