diff --git a/web/app/View/Elements/tabs-buffers.ctp b/web/app/View/Elements/tabs-buffers.ctp
new file mode 100644
index 000000000..173c5ec81
--- /dev/null
+++ b/web/app/View/Elements/tabs-buffers.ctp
@@ -0,0 +1,13 @@
+<div id="buffers">
+<?php 
+	echo $this->Form->inputs(array(
+		'ImageBufferCount',
+		'WarmupCount',
+		'PreEventCount',
+		'PostEventCount',
+		'StreamReplayBuffer',
+		'AlarmFrameCount',
+		'legend' => false
+	));
+?>
+</div>
diff --git a/web/app/View/Elements/tabs-control.ctp b/web/app/View/Elements/tabs-control.ctp
new file mode 100644
index 000000000..502088bfd
--- /dev/null
+++ b/web/app/View/Elements/tabs-control.ctp
@@ -0,0 +1,2 @@
+<div id="control">
+</div>
diff --git a/web/app/View/Elements/tabs-general.ctp b/web/app/View/Elements/tabs-general.ctp
new file mode 100644
index 000000000..be5ae21ed
--- /dev/null
+++ b/web/app/View/Elements/tabs-general.ctp
@@ -0,0 +1,11 @@
+<div id="general">
+<?php
+echo $this->Form->input('Name');
+echo $this->Form->input('Type', array( 'type' => 'select', 'options' => $typeoptions));
+echo $this->Form->input('Function', array('type' => 'select', 'options' => $functionoptions));
+echo $this->Form->input('Enabled', array('type' => 'checkbox'));
+echo $this->Form->input('MaxFPS');
+echo $this->Form->input('AlarmMaxFPS');
+echo $this->Form->input('RefBlendPerc');
+?>
+</div>
diff --git a/web/app/View/Elements/tabs-misc.ctp b/web/app/View/Elements/tabs-misc.ctp
new file mode 100644
index 000000000..49c4c7d13
--- /dev/null
+++ b/web/app/View/Elements/tabs-misc.ctp
@@ -0,0 +1,21 @@
+<div id="misc">
+<?php
+	echo $this->Form->inputs(array(
+		'EventPrefix',
+		'SectionLength',
+		'FrameSkip',
+		'FPSReportInterval',
+		'DefaultView',
+		'DefaultRate',
+		'DefaultScale',
+		'WebColour',
+		'legend' => false
+	));
+
+	echo $this->Form->input('LinkedMonitors', array(
+		'type' => 'checkbox',
+		'options' => $linkedMonitors,
+	));
+
+?>
+</div>
diff --git a/web/app/View/Elements/tabs-source.ctp b/web/app/View/Elements/tabs-source.ctp
new file mode 100644
index 000000000..b8e45f9af
--- /dev/null
+++ b/web/app/View/Elements/tabs-source.ctp
@@ -0,0 +1,50 @@
+<div id="source">
+<?php
+switch ($monitor['Type']) {
+case 'Remote':
+	echo $this->Form->input('Protocol', array(
+		'type' => 'select',
+		'options' => $protocoloptions
+	));
+	echo $this->Form->input('Method', array(
+		'type' => 'select',
+		'options' => $methodoptions
+	));
+	echo $this->Form->input('Host');
+	echo $this->Form->input('Port');
+	echo $this->Form->input('Path');
+	break;
+
+case 'Local':
+	echo $this->Form->input('Path');
+	echo $this->Form->input('Method', array(
+		'type' => 'select',
+		'options' => $optionsMethod
+	));
+	echo $this->Form->input('Channel', array(
+		'type' => 'select',
+		'options' => $channeloptions
+	));
+	echo $this->Form->input('Format', array(
+		'type' => 'select',
+		'options' => $formatoptions
+	));
+	echo $this->Form->input('Palette', array(
+		'type' => 'select',
+		'options' => $optionsPalette
+	));
+	break;
+
+case 'File':
+	break;
+}
+
+echo $this->Form->input('Colours', array(
+	'type' => 'select',
+	'options' => $optionsColours
+));
+echo $this->Form->input('Width');
+echo $this->Form->input('Height');
+
+?>
+</div>
diff --git a/web/app/View/Elements/tabs-timestamp.ctp b/web/app/View/Elements/tabs-timestamp.ctp
new file mode 100644
index 000000000..c50c827de
--- /dev/null
+++ b/web/app/View/Elements/tabs-timestamp.ctp
@@ -0,0 +1,10 @@
+<div id="timestamp">
+<?php
+	echo $this->Form->inputs(array(
+		'LabelFormat',
+		'LabelX',
+		'LabelY',
+		'legend' => false
+	));
+?>
+</div>
diff --git a/web/app/View/Monitors/edit.ctp b/web/app/View/Monitors/edit.ctp
index a5bb9650a..5c1812497 100644
--- a/web/app/View/Monitors/edit.ctp
+++ b/web/app/View/Monitors/edit.ctp
@@ -1,10 +1,23 @@
-<h2>Edit Monitor</h2>
-<?php
-    echo $this->Form->create('Monitor');
-    echo $this->Form->input('Name');
-    $functionoptions = array('Modect' => 'Modect', 'Monitor' => 'Monitor', 'Record' => 'Record', 'None' => 'None', 'Nodect' => 'Nodect', 'Mocord' => 'Mocord');
-    echo $this->Form->input('Function', array('type' => 'select', 'options' => $functionoptions));
-    echo $this->Form->input('Enabled', array('type' => 'checkbox'));
-    echo $this->Form->input('Id', array('type' => 'hidden'));
-    echo $this->Form->end('Save Monitor');
-?>
+<?php echo $this->Form->create('Monitor', array( 'inputDefaults' => array( 'legend' => false, 'fieldset' => false))); ?>
+<?php echo $this->Form->input('Id', array('type' => 'hidden')); ?>
+<div id="tabs">
+	<ul>
+		<li><a href="#general">General</a></li>
+		<li><a href="#source">Source</a></li>
+		<li><a href="#timestamp">Timestamp</a></li>
+		<li><a href="#buffers">Buffers</a></li>
+		<li><a href="#control">Control</a></li>
+		<li><a href="#misc">Misc</a></li>
+	</ul>
+
+
+<?php echo $this->element('tabs-general'); ?>
+<?php echo $this->element('tabs-source'); ?>
+<?php echo $this->element('tabs-timestamp'); ?>
+<?php echo $this->element('tabs-buffers'); ?>
+<?php echo $this->element('tabs-control'); ?>
+<?php echo $this->element('tabs-misc'); ?>
+
+
+</div>
+<?php echo $this->Form->end('Save Monitor'); ?>