diff --git a/css/main.css b/css/main.css
index 98bb6f59d..34300ee72 100644
--- a/css/main.css
+++ b/css/main.css
@@ -93,6 +93,13 @@ a {
   color: #3498DB;
 }
 
+.signin label, .setup label {
+  font-size: 0.875rem;
+  color: #fff;
+  font-weight: 100;
+  margin-bottom: 0.5rem;
+}
+
 a:hover {
   color: #2980b9;
 }
diff --git a/views/setup.html b/views/setup.html
index 66d1cca86..128266906 100644
--- a/views/setup.html
+++ b/views/setup.html
@@ -12,18 +12,18 @@
         <div class="large-8 columns line-dashed-setup-v">
           <div class="box-setup oh">
             <h1 class="text-secondary line-sidebar-b">Create new wallet</h1>
-            <h4 ng-show="!isSetupWalletPage">Wallet name
+            <label ng-show="!isSetupWalletPage">Wallet name
               <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
-            </h4>
+            </label>
             <div class="row" ng-show="isSetupWalletPage">
               <div>
-                <h4>Your name
-                  <input type="text" placeholder="Name" class="form-control" ng-model="myNickname">
-                </h4>
+                <label for="Name">Your name</label>
+                  <input id="Name" type="text" placeholder="Name" class="form-control" ng-model="myNickname">
               </div>
               <div>
-                <h4>Your Wallet Password <small data-options="disable_for_touch:true" class="has-tip text-gray" tooltip="doesn't need to be shared">Required</small>
-                  <input type="password" placeholder="Choose your password" class="form-control"
+                <label for="walletPassword">Your Wallet Password <small data-options="disable_for_touch:true" class="has-tip text-gray" tooltip="doesn't need to be shared" >Required</small>
+                </label>
+                  <input id="walletPassword" type="password" placeholder="Choose your password" class="form-control"
                   ng-model="$parent.walletPassword" 
                   name="walletPassword"
                   check-strength="passwordStrength" 
@@ -31,30 +31,29 @@
                   <i>{{passwordStrength}}</i><br/><span
                     class='size-12'>Tip: Use lower and uppercase, numbers and
                     symbols</span>" 
-                  tooltip-trigger="focus" required>
-
+                  tooltip-trigger="focus" required
+                  tooltip-placement="bottom">
+                  
                   <input type="password" 
                   placeholder="Repeat password"
                   name="walletPasswordConfirm"
                   ng-model="walletPasswordConfirm" 
                   match="walletPassword" 
                   required>
-
-                </h4>
               </div>
             </div>
             <div class="row" ng-show="!isSetupWalletPage">
               <div class="large-6 medium-6 columns">
-                <h4>Select total number of copayers
+                <label>Select total number of copayers
                   <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
                   </select>
-                </h4>
+                </label>
               </div>
               <div class="large-6 medium-6 columns">
-                <h4>Select required signatures
+                <label>Select required signatures
                   <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues">
                   </select>
-                </h4>
+                </label>
               </div>
             </div>
             <div class="box-setup-copayers" ng-show="!isSetupWalletPage">
diff --git a/views/signin.html b/views/signin.html
index 7f4b3fcb9..4a26c3991 100644
--- a/views/signin.html
+++ b/views/signin.html
@@ -41,10 +41,10 @@
         <div class="box-setup">
         <h1 class="text-primary line-sidebar-b">Join a Wallet in Creation</h1>
           <form name="joinForm" ng-submit="join(joinForm)" novalidate>
-            <h4>Wallet Setting</h4>
-            <input type="text" class="form-control" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
-            <h4>User info</h4>
-            <input type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
+            <label for="connectionId"> Wallet Setting </label>
+            <input id="connectionId" type="text" class="form-control" placeholder="Paste wallet secret here" name="connectionId" ng-model="connectionId" wallet-secret required>
+            <label for="joinPassword"> User info</label>
+            <input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
             <input type="password" class="form-control"
             placeholder="Choose your password" name="joinPassword"
             ng-model="$parent.joinPassword"