diff --git a/preferences/templates/default/app.css b/preferences/templates/default/app.css
index 14deadd93a..00152101b1 100644
--- a/preferences/templates/default/app.css
+++ b/preferences/templates/default/app.css
@@ -44,6 +44,8 @@ tr.prefRow > td {
     padding: 5px;
     margin-top: -4px;
     top: 0;
+	overflow-y: auto;
+    z-index: 1;
 }
 tr.prefRow:hover .prefHelp {
 	display: block;
@@ -51,9 +53,15 @@ tr.prefRow:hover .prefHelp {
 }
 .prefDefault, .prefValue {
 	float: left;
+	display: inline-block;
 }
 .prefValue {
 	margin-right: 5px;
+	width:49%;
+}
+.prefDefault {
+	float: right;
+	width:48%;
 }
 .prefValue textarea, textarea.prefValue {
 	width: 99%;
@@ -65,7 +73,7 @@ tr.prefRow:hover .prefHelp {
 	margin-right: 5px;
 }
 .prefType{
-	width:50%;
+	width:49%;
 }
 .prefApp {
 	width:49.50%;
diff --git a/preferences/templates/default/settings.xet b/preferences/templates/default/settings.xet
index 0188207d01..4190e15a64 100644
--- a/preferences/templates/default/settings.xet
+++ b/preferences/templates/default/settings.xet
@@ -34,7 +34,7 @@
 				<menupopup id="type" onchange="1" class="prefType"/>
 			</menulist>
 		</hbox>
-		<tabbox id="tabs">
+		<tabbox id="tabs" tab_height="400">
 			<tabs>
 				<tab id="tab1" label="Settings"/>
 			</tabs>
diff --git a/preferences/templates/pixelegg/app.css b/preferences/templates/pixelegg/app.css
index 3b719f83b0..0df003bd78 100755
--- a/preferences/templates/pixelegg/app.css
+++ b/preferences/templates/pixelegg/app.css
@@ -59,6 +59,8 @@ tr.prefRow > td {
   padding: 5px;
   margin-top: -4px;
   top: 0;
+  overflow-y: auto;
+  z-index: 1;
 }
 tr.prefRow:hover .prefHelp {
   display: block;
@@ -68,9 +70,15 @@ tr.prefRow:hover .prefHelp {
 .prefDefault,
 .prefValue {
   float: left;
+  display: inline-block;
 }
 .prefValue {
   margin-right: 5px;
+  width: 49%;
+}
+.prefDefault {
+  float: right;
+  width: 48%;
 }
 .prefValue textarea,
 textarea.prefValue {
@@ -84,7 +92,7 @@ textarea.prefValue {
   margin-right: 5px;
 }
 .prefType {
-  width: 50%;
+  width: 49%;
 }
 .prefApp {
   width: 49.50%;
@@ -135,13 +143,15 @@ tr.prefRow > td {
 .prefHelp {
   position: absolute;
   display: none;
-  width: 254px;
+  width: 250px;
   max-height: 99%;
   height: 97%;
   padding: 5px;
   margin-top: -4px;
   top: 0;
   z-index: 1;
+  border: 2px solid dimgrey;
+  border-radius: 5px;
 }
 .prefHelpColumn {
   border-left: 1px solid #e6e6e6 !important;
diff --git a/preferences/templates/pixelegg/app.less b/preferences/templates/pixelegg/app.less
index a2fd141d51..73fbf5adaf 100755
--- a/preferences/templates/pixelegg/app.less
+++ b/preferences/templates/pixelegg/app.less
@@ -57,13 +57,15 @@ tr.prefRow > td {
 .prefHelp {
 	position: absolute;
     display: none;
-    width: 254px;
+    width: 250px;
     max-height: 99%;
     height: 97%;
     padding: 5px;
     margin-top: -4px;
     top: 0;
 	z-index: 1;
+	border: 2px solid dimgrey;
+    border-radius: 5px;
 }
 .prefHelpColumn {border-left:1px solid #e6e6e6 !important;}
 tr.prefRow:hover .prefHelp {