diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php
index 56d9683101..0b26c819a8 100644
--- a/html/pages/device/edit.inc.php
+++ b/html/pages/device/edit.inc.php
@@ -10,6 +10,8 @@ if ($_SESSION['userlevel'] < '7')
   $panes['ports']    = 'Port Settings';
   $panes['apps']     = 'Applications';
   $panes['alerts']   = 'Alerts';
+  $panes['modules']  = 'Modules';
+
 
   if ($config['enable_services'])
   {
diff --git a/html/pages/device/edit/modules.inc.php b/html/pages/device/edit/modules.inc.php
new file mode 100644
index 0000000000..67f869deec
--- /dev/null
+++ b/html/pages/device/edit/modules.inc.php
@@ -0,0 +1,32 @@
+<?php
+
+echo('<div style="margin: 0px 10px; width: 500px; float: left;">');
+$i=0;
+
+echo('<div style="padding:4px 0px 4px 8px;" class=graphhead>Poller Modules</div>');
+
+echo('<table width="100%" cellpadding=5>');
+foreach($config['poller_modules'] as $module => $module_status)
+{
+  if (!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; }
+  echo('<tr bgcolor="'.$bg_colour.'"><td><b>'.$module.'</b></td><td>'.($module_status ? '<span class=green>enabled</span>' : '<span class=red>disabled</span>' ).'</td></tr>');
+  $i++;
+}
+echo('</table>');
+echo('</div>');
+
+echo('<div style="margin: 0px 10px; width: 500px; float: right;">');
+$i=0;
+echo('<div style="padding:4px 0px 4px 8px;" class=graphhead>Discovery Modules</div>');
+echo('<table width="100%" cellpadding=5>');
+foreach($config['discovery_modules'] as $module => $module_status)
+{
+  if (!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; }
+  echo('<tr bgcolor="'.$bg_colour.'"><td><b>'.$module.'</b></td><td>'.($module_status ? '<span class=green>enabled</span>' : '<span class=red>disabled</span>' ).'</td></tr>');
+  $i++;
+}
+echo('</table>');
+echo('</div>');
+
+
+?>