diff --git a/src/app.js b/src/app.js
index cff05fc284..720788e895 100644
--- a/src/app.js
+++ b/src/app.js
@@ -214,8 +214,13 @@ function run () {
     },
     getValue: (cb) => {
       try {
-        var comp = $('#value').val().split(' ')
-        cb(null, executionContext.web3().toWei(comp[0], comp.slice(1).join(' ')))
+        var number = document.querySelector('#value').value
+        var select = document.getElementById('unit')
+        var index = select.selectedIndex
+        var selectedUnit = select.querySelectorAll('option')[index].innerHTML
+        var unit = ''
+        if (selectedUnit === 'wei') { unit = 'wei' }
+        cb(null, executionContext.web3().toWei(number, unit))
       } catch (e) {
         cb(e)
       }
diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js
index 3aaac2477f..b8c2484aa2 100644
--- a/src/app/tabs/run-tab.js
+++ b/src/app/tabs/run-tab.js
@@ -45,6 +45,16 @@ var css = csjs`
   .col2 {
     ${styles.rightPanel.runTab.input_RunTab}
   }
+  .col2_1 {
+    ${styles.rightPanel.runTab.input_RunTab}
+    width: 165px;
+    min-width: 165px;
+  }
+  .col2_2 {
+    ${styles.rightPanel.runTab.dropdown_RunTab}
+    width: 82px;
+    min-width: 82px;
+  }
   .select {
     ${styles.rightPanel.runTab.dropdown_RunTab}
     font-weight: normal;
@@ -254,8 +264,8 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
     }
   })
 
-  var atAddressButtonInput = yo`<input class="${css.input} ataddressinput" placeholder="Enter contract's address - i.e. 0x60606..." title="atAddress" />`
-  var createButtonInput = yo`<input class="${css.input}" placeholder="" title="create" />`
+  var atAddressButtonInput = yo`<input class="${css.input} ataddressinput" placeholder="Enter address of contract you want to load" title="atAddress" />`
+  var createButtonInput = yo`<input class="${css.input}" placeholder="" title="Create" />`
   var selectContractNames = yo`<select class="${css.contractNames}" disabled></select>`
   var el = yo`
     <div class="${css.container}">
@@ -264,12 +274,12 @@ function contractDropdown (appAPI, appEvents, instanceContainer) {
       </div>
       <div class="${css.buttons}">
         <div class="${css.button}">
-          <div class="${css.atAddress}" onclick=${function () { loadFromAddress(appAPI) }}>At Address</div>
-          ${atAddressButtonInput}
+        ${createButtonInput}
+        <div class="${css.create}" onclick=${function () { createInstance() }} >Create</div>
         </div>
         <div class="${css.button}">
-          <div class="${css.create}" onclick=${function () { createInstance() }} >Create</div>
-          ${createButtonInput}
+          ${atAddressButtonInput}
+          <div class="${css.atAddress}" onclick=${function () { loadFromAddress(appAPI) }}>Load</div>
         </div>
       </div>
     </div>
@@ -412,7 +422,11 @@ function settings (appAPI, appEvents) {
       </div>
       <div class="${css.crow}">
       <div class="${css.col1_1}">Value</div>
-        <input type="text" class="${css.col2}" id="value" value="0" title="(e.g. .7 ether ...)">
+        <input type="text" class="${css.col2_1}" id="value" value="0" title="Default the value is set to be in ether, if you want the value to be in wei, type i.e. 7 wei.">
+        <select name="unit" class="${css.col2_2}" id="unit">
+          <option id="unit-eth">eth</option>
+          <option id="unit-wei">wei</option>
+        </select>
       </div>
     </div>
   `
diff --git a/src/universal-dapp.js b/src/universal-dapp.js
index fe46a18d3d..d5a4c54ce9 100644
--- a/src/universal-dapp.js
+++ b/src/universal-dapp.js
@@ -36,12 +36,15 @@ var css = csjs`
     justify-content: space-between;
     align-items: center;
     font-size: 11px;
-    width: 75%;
-    min-width: 500px;
+    min-width: 350px;
     overflow: hidden;
     word-break: break-word;
     line-height: initial;
   }
+  .titleLine {
+    display: flex;
+    align-items: baseline;
+  }
   .titleText {
     margin-right: 1em;
     word-break: break-word;
@@ -295,13 +298,17 @@ UniversalDApp.prototype.renderInstance = function (contract, address, contractNa
 
   address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex')
   var shortAddress = helper.shortenAddress(address)
-  var title = yo`<div class="${css.title}" onclick=${toggleClass}>
-    <div class="${css.titleText}"> ${contractName} at ${shortAddress} (${context}) </div>
-    <i class="fa fa-clipboard ${css.copy}" aria-hidden="true" onclick=${copyToClipboard} title='Copy to clipboard'></i>
-  </div>`
+  var title = yo`
+    <div class=${css.titleLine}>
+      <div class="${css.title}" onclick=${toggleClass}>
+        <div class="${css.titleText}"> ${contractName} at ${shortAddress} (${context}) </div>
+      </div>
+      <i class="fa fa-clipboard ${css.copy}" aria-hidden="true" onclick=${copyToClipboard} title='Copy to clipboard'></i>
+    </div>
+  `
   if (self.removable_instances) {
     var close = yo`<div class="${css.udappClose}" onclick=${remove}><i class="${css.closeIcon} fa fa-close" aria-hidden="true"></i></div>`
-    title.appendChild(close)
+    title.querySelector(`.${css.title}`).appendChild(close)
   }
 
   function toggleClass () {