diff --git a/assets/css/universal-dapp.css b/assets/css/universal-dapp.css
index fd4a9446f1..349d63ac82 100644
--- a/assets/css/universal-dapp.css
+++ b/assets/css/universal-dapp.css
@@ -303,15 +303,22 @@
 }
 
 .udapp .legend {
-	font-size: 12px;
-	float: left;
-	color: #666;
+	background-color: white;
+	line-height: 20px;
+	border: .2em dotted lightGrey;
+	padding: 8px 15px;
+	border-radius: 5px;
+	margin-bottom: 1em;
+	display: flex;
+	justify-content: space-around;
 }
 
 .udapp .legend div {
 	display: inline-block;
 	margin-right: 0.5em;
-	margin-bottom: 1em;
+	display: flex;
+	align-items: center;
+	line-height: 0px;
 }
 
 .udapp .legend div:before {
diff --git a/nightwatch.js b/nightwatch.js
index 6a513c6f6d..296c64b87b 100644
--- a/nightwatch.js
+++ b/nightwatch.js
@@ -50,8 +50,8 @@ module.exports = {
       'desiredCapabilities': {
         'browserName': 'safari',
         'javascriptEnabled': true,
-        'platform': 'OS X 10.10',
-        'version': '8.0',
+        'platform': 'OS X 10.11',
+        'version': '10.0',
         'acceptSslCerts': true,
         'build': 'build-' + TRAVIS_JOB_NUMBER,
         'tunnel-identifier': 'browsersolidity_tests_' + TRAVIS_JOB_NUMBER
diff --git a/src/app/contract-tab.js b/src/app/contract-tab.js
index e5b7e3b7a6..44b2ce161b 100644
--- a/src/app/contract-tab.js
+++ b/src/app/contract-tab.js
@@ -35,7 +35,7 @@ var css = csjs`
   }
   .contract {
     display: block;
-    margin: 5em 0 2em 0;
+    margin: 4em 0 2em 0;
   }
 `
 
diff --git a/src/app/renderer.js b/src/app/renderer.js
index d16fbc0e35..2ff660a27f 100644
--- a/src/app/renderer.js
+++ b/src/app/renderer.js
@@ -18,13 +18,19 @@ var css = csjs`
       width: 30%;
       float: left;
   }
-  .toggle  {
-    font-size: 1em;
+  .toggleText  {
     text-decoration: underline;
+    margin-left: 2px;
+    font-size: .9em;
+  }
+  .toggle  {
+    font-size: 1.1em;
     color: ${styles.colors.blue};
     margin: 1em;
     cursor: pointer;
     font-weight: 400;
+    display: flex;
+    align-items: center;
   }
   .toggle:hover {
     opacity: .8;
@@ -248,7 +254,7 @@ Renderer.prototype.contracts = function (data, source) {
 
   var detailsOpen = {}
   var getDetails = function (contract, source, contractName) {
-    var button = $(`<div class="${css.toggle}"><i class="fa fa-info-circle" aria-hidden="true"></i> Contract details (bytecode, interface etc.)</div>`)
+    var button = $(`<div class="${css.toggle}"><i class="fa fa-info-circle" aria-hidden="true"></i><div class="${css.toggleText}">Contract details (bytecode, interface etc.)</div></div>`)
     var details = $('<div style="display: none;"/>')
 
     if (contract.bytecode) {
diff --git a/src/app/settings-tab.js b/src/app/settings-tab.js
index 0806623b6b..1c80864b0a 100644
--- a/src/app/settings-tab.js
+++ b/src/app/settings-tab.js
@@ -28,10 +28,12 @@ var css = csjs`
     text-align: -webkit-center;
   }
   .col1 extends ${styles.titleL} {
-    width: 30%;
     float: left;
     align-self: center;
   }
+  .checkboxText {
+    margin-left: 3px;
+  }
 }
 `
 module.exports = settingsTab
@@ -47,16 +49,16 @@ function settingsTab () {
         <select class="${css.select}" id="versionSelector"></select>
       </div>
       <div class="${css.crow}">
-        Text Wrap
-        <input class="${css.col1}" id="editorWrap" type="checkbox">
+        <div><input class="${css.col1}" id="editorWrap" type="checkbox"></div>
+        <span class="${css.checkboxText}">Text Wrap</span>
       </div>
       <div class="${css.crow}">
-        Enable Optimization
-        <input id="optimize" type="checkbox">
+        <div><input class="${css.col1}" id="optimize" type="checkbox"></div>
+        <span class="${css.checkboxText}">Enable Optimization</span>
       </div>
       <div class="${css.crow}">
-        Auto Compile
-        <input id="autoCompile" type="checkbox" checked>
+        <div><input class="${css.col1}" id="autoCompile" type="checkbox" checked></div>
+        <span class="${css.checkboxText}">Auto Compile</span>
       </div>
       </div>
       <div class="${css.crow}">