diff --git a/src/search.qrc b/src/search.qrc
index 37caac734..57b56c4ec 100644
--- a/src/search.qrc
+++ b/src/search.qrc
@@ -6,6 +6,7 @@
   <file>search_engine/nova2.py</file>
   <file>search_engine/engines/isohunt.py</file>
   <file>search_engine/engines/isohunt.png</file>
+  <file>search_engine/engines/torrentule.py</file>
   <file>search_engine/engines/piratebay.py</file>
   <file>search_engine/engines/torrentreactor.py</file>
   <file>search_engine/engines/piratebay.png</file>
@@ -13,6 +14,7 @@
   <file>search_engine/engines/btjunkie.py</file>
   <file>search_engine/engines/torrentreactor.png</file>
   <file>search_engine/engines/mininova.png</file>
+  <file>search_engine/engines/sharetv.py</file>
   <file>search_engine/engines/mininova.py</file>
 </qresource>
 </RCC>
\ No newline at end of file
diff --git a/src/webui/css/style.css b/src/webui/css/style.css
index 1ee31c133..ac926bb6f 100644
--- a/src/webui/css/style.css
+++ b/src/webui/css/style.css
@@ -124,6 +124,7 @@ hr {
 	width: 120px;
 	border-right: 1px solid #ccc;
 	color: #000;
+	vertical-align: top;
 }
 
 #Filters ul {
@@ -142,9 +143,37 @@ hr {
 
 #Transfers {
 	vertical-align: top;
+	height: 100%;
+}
+
+#transferListContainer {
+	height: 50%;
+	border-bottom: 1px solid #ccc;
+	overflow: auto;
 }
 
 .selectedFilter {
 	background-color: #354158;
 	color: #000;
 }
+
+div #PropDiv {
+	height: 50%;
+}
+
+div.PropPanel {
+	background-color: #e5e5e5;
+	overflow: auto;
+}
+
+a.propButton {
+	border: 1px solid rgb(85, 81, 91);
+	/*border-radius: 3px;*/
+	padding: 2px;
+	margin-left: 3px;
+	margin-right: 3px;
+}
+
+a.propButton img {
+	margin-bottom: -4px;
+}
diff --git a/src/webui/index.html b/src/webui/index.html
index 560e6b212..46880327c 100644
--- a/src/webui/index.html
+++ b/src/webui/index.html
@@ -20,9 +20,9 @@
 <body>
 	<div id="desktop">
 		<div id="desktopHeader">
-			<div id="desktopTitlebar">
+			<!--<div id="desktopTitlebar">
 				<h1 class="applicationTitle">qBittorrent Web User Interface <span class="version">version 2.0.0</span></h1>
-			</div>
+			</div>-->
 			<div id="desktopNavbar">
 				<ul>
 					<li>
@@ -71,18 +71,19 @@
 				</span>
 			</div>
 		</div>
-		<div id="pageWrapper">						<span id="error_div"></span>
-			<table>
+		<div id="pageWrapper" style="height: 100%">						<span id="error_div"></span>
+			<table style="height: 100%">
 				<tr><td id="Filters">
 				<ul>
-					<li class="selectedFilter" id="all_filter"><a href="#" onclick="setFilter('all');"><img src="images/oxygen/folder.png"/>_(All)</li>
+					<li class="selectedFilter" id="all_filter"><a href="#" onclick="setFilter('all');"><img src="images/skin/filterall.png"/>_(All)</li>
 					<li id="downloading_filter"><a href="#" onclick="setFilter('downloading');"><img src="images/skin/downloading.png"/>_(Downloading)</li>
-					<li id="completed_filter"><a href="#" onclick="setFilter('completed');"><img src="images/skin/seeding.png"/>_(Completed)</li>
-					<li id="active_filter"><a href="#" onclick="setFilter('active');"><img src="images/oxygen/draw-triangle2.png"/>_(Active)</li>
-					<li id="inactive_filter"><a href="#" onclick="setFilter('inactive');"><img src="images/oxygen/draw-rectangle.png"/>_(Inactive)</li>
+					<li id="completed_filter"><a href="#" onclick="setFilter('completed');"><img src="images/skin/uploading.png"/>_(Completed)</li>
+					<li id="active_filter"><a href="#" onclick="setFilter('active');"><img src="images/skin/filteractive.png"/>_(Active)</li>
+					<li id="inactive_filter"><a href="#" onclick="setFilter('inactive');"><img src="images/skin/filterinactive.png"/>_(Inactive)</li>
 				</ul>
 				</td>
 			<td id="Transfers">
+				<div id="transferListContainer">
 								<table class="torrentTable" cellpadding="0" cellspacing="0">
 									<thead>
 										<tr>
@@ -102,7 +103,20 @@
 									</thead>
 									<tbody id="myTable"></tbody>
 								</table>
-			</td><tr>
+				</div>
+				<div id="PropDiv">
+								<div class="PropPanel">
+								</div>
+								<a href="#" class="propButton">
+									<img src="images/oxygen/help-about.png"/>
+									_(General)
+								</a>
+								<a href="#" class="propButton">
+									<img src="images/oxygen/folder.png"/>
+									_(Files)
+								</a>
+				</div>
+			</td></tr></table>
 			</div><!-- tab1 -->
 	</div>
 	</div>
diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index 8d53840c0..095726c0f 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -39,23 +39,27 @@ window.addEvent('domready', function(){
     switch (state)
     {
       case 'pausedUP':
+	return '<img src="images/skin/pausedUP.png"/>';
       case 'pausedDL':
-          return '<img src="images/skin/paused.png"/>';
+        return '<img src="images/skin/pausedDL.png"/>';
       case 'seeding':
+	return '<img src="images/skin/uploading.png"/>';
       case 'stalledUP':
-          return '<img src="images/skin/seeding.png"/>';
+          return '<img src="images/skin/stalledUP.png"/>';
       case 'checkingUP':
+	return '<img src="images/skin/checkingUP.png"/>';
       case 'checkingDL':
-          return '<img src="images/oxygen/run-build.png"/>';
+          return '<img src="images/skin/checkingDL.png"/>';
       case 'downloading':
           return '<img src="images/skin/downloading.png"/>';
       case 'stalledDL':
-          return '<img src="images/skin/stalled.png"/>';
+          return '<img src="images/skin/stalledDL.png"/>';
       case 'queuedUP':
+	return '<img src="images/skin/queuedUP.png"/>';
       case 'queuedDL':
-          return '<img src="images/oxygen/mail-queue.png"/>';
+          return '<img src="images/skin/queuedDL.png"/>';
       default:
-	  return '<img src="images/skin/stalled.png"/>';
+	  return '';
     }
     return '';
   };
