diff --git a/src/webui.qrc b/src/webui.qrc
index fc3792138..fb1c22824 100644
--- a/src/webui.qrc
+++ b/src/webui.qrc
@@ -7,6 +7,9 @@
   <file>webui/about.html</file>
   <file>webui/filters.html</file>
   <file>webui/transferlist.html</file>
+  <file>webui/prop-general.html</file>
+  <file>webui/prop-trackers.html</file>
+  <file>webui/prop-files.html</file>
   <file>webui/properties.html</file>
   <file>webui/css/mocha.css</file>
   <file>webui/css/dynamicTable.css</file>
diff --git a/src/webui/prop-files.html b/src/webui/prop-files.html
new file mode 100644
index 000000000..33840068c
--- /dev/null
+++ b/src/webui/prop-files.html
@@ -0,0 +1 @@
+CONTENT
\ No newline at end of file
diff --git a/src/webui/prop-general.html b/src/webui/prop-general.html
new file mode 100644
index 000000000..33840068c
--- /dev/null
+++ b/src/webui/prop-general.html
@@ -0,0 +1 @@
+CONTENT
\ No newline at end of file
diff --git a/src/webui/prop-trackers.html b/src/webui/prop-trackers.html
new file mode 100644
index 000000000..33840068c
--- /dev/null
+++ b/src/webui/prop-trackers.html
@@ -0,0 +1 @@
+CONTENT
\ No newline at end of file
diff --git a/src/webui/properties.html b/src/webui/properties.html
index 933b6a5c8..874f4f4c3 100644
--- a/src/webui/properties.html
+++ b/src/webui/properties.html
@@ -1,36 +1,44 @@
-<div>
+<div class="toolbarTabs">
 	<!-- <div style="float:right;padding-top:3px;"><img src="images/icons/help.gif" width="16" height="16" alt="Help" /></div> -->
 	<ul id="propertiesTabs" class="tab-menu">
-		<li id="PropGeneralLink" class="selected"><a>General</a></li>
-		<li id="PropTrackersLink"><a>Trackers</a></li>
-		<li id="PropFilesLink"><a>Files</a></li>
+		<li id="PropGeneralLink" class="selected"><a>_(General)</a></li>
+		<li id="PropTrackersLink"><a>_(Trackers)</a></li>
+		<li id="PropFilesLink"><a>_(Files)</a></li>
 	</ul>
 	<div class="clear"></div>
-	<!--<div id="propertyTab"></div>-->
+	<div id="propertyTab"></div>
 </div>
 
 <script type="text/javascript">
 
 	MochaUI.initializeTabs('propertiesTabs');
+	MochaUI.updateContent({
+			'element':  $('properties'),
+		        'childElement': $('propertyTab'),
+			'url':       'prop-general.html'
+		});
 
 	$('PropGeneralLink').addEvent('click', function(e){
 		MochaUI.updateContent({
-			'element':  $('propertyTab'),
-			'url':       'pages/features-layout.html'
+			'element':  $('properties'),
+		        'childElement': $('propertyTab'),
+			'url':       'prop-general.html'
 		});
 	});
 
 	$('PropTrackersLink').addEvent('click', function(e){
 		MochaUI.updateContent({
-			'element':  $('propertyTab'),
-			'url':       'pages/features-windows.html'
+			'element':  $('properties'),
+			'childElement': $('propertyTab'),
+			'url':       'prop-trackers.html'
 		});
 	});
 
 	$('PropFilesLink').addEvent('click', function(e){
 		MochaUI.updateContent({
-			'element':  $('propertyTab'),
-			'url':       'pages/features-general.html'
+			'element':  $('properties'),
+			'childElement': $('propertyTab'),
+			'url':       'prop-files.html'
 		});
 	});