diff --git a/testbed/www/css/index.css b/testbed/www/css/index.css
index 5f4564c7..639e96e0 100644
--- a/testbed/www/css/index.css
+++ b/testbed/www/css/index.css
@@ -4,8 +4,32 @@
   background-color: #FFFFFF;
 }
 body {
-  padding: 0.8em 0em 0.2em 0em;
+  display: flex;
+  flex-direction: column;
+  padding: 1em 0em 0.5em 0em;
   max-width: 40em;
+  margin: 0 auto;
+}
+fieldset {
+  border-color: #303030;
+  margin: 0.5em 1em;
+  padding: 0.75em;
+}
+fieldset > *:not(:first-child) {
+  margin-bottom: 0.5em;
+}
+fieldset > *:last-child {
+  margin-bottom: 0;
+}
+section {
+  display: flex;
+  flex-direction: row;
+}
+section > button:nth-child(even) {
+  margin-left: 0.5em;
+}
+section > button:nth-child(odd) {
+  margin-right: 0.5em;
 }
 button, input {
   padding: 0.5em;
@@ -14,20 +38,4 @@ button, input {
 }
 button {
   background-color: #F5F5F5;
-}
-div, fieldset {
-  border-color: #303030;
-  margin: 0.5em 0;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: flex;
-  justify-content: space-around;
-  -webkit-flex-direction: row;
-  flex-direction: row;
-}
-fieldset > div > *, div > * {
-  margin: 0 0.5em;
-  width: 0em;
-  -webkit-flex-grow: 1;
-  flex-grow: 1;
 }
\ No newline at end of file
diff --git a/testbed/www/index.html b/testbed/www/index.html
index 747907cf..3d2caeae 100644
--- a/testbed/www/index.html
+++ b/testbed/www/index.html
@@ -9,84 +9,60 @@
   <title>Branch Testing</title>
 </head>
 <body>
-  <div>
-    <fieldset>
-      <legend>Branch Universal Object</legend>
-      <div>
-        <button onclick="BranchUniversalObject()">Create</button>
-      </div>
-    </fieldset>
-  </div>
-  <div>
-    <fieldset>
-      <legend>Branch Deep Link</legend>
-      <div>
-        <input id="alias" name="alias" type="text" placeholder="Enter an alias">
-      </div>
-      <div>
+  <fieldset>
+    <legend>Branch Universal Object</legend>
+    <button onclick="BranchUniversalObject()">Create</button>
+  </fieldset>
+  <fieldset>
+    <legend>Branch Deep Link</legend>
+      <input id="alias" name="alias" type="text" placeholder="Deep link alias (optional)">
+      <section>
         <button onclick="BranchDeepLink()">Create</button>
         <button onclick="BranchShareSheet()">Share</button>
-      </div>
-      <div>
-        <input type="text" id="generated-url" placeholder="Deep Link" readonly>
-      </div>
-    </fieldset>
-  </div>
-  <div>
-    <fieldset>
-      <legend>Branch Deep Link Data</legend>
-      <div>
-        <button onclick="BranchFirstData()">First</button>
-        <button onclick="BranchLatestData()">Latest</button>
-      </div>
-    </fieldset>
-  </div>
-  <div>
-    <fieldset>
-      <legend>Branch Content</legend>
-      <div>
-        <button onclick="BranchView()">Create</button>
-        <button onclick="BranchSpotlight()">Share</button>
-      </div>
-    </fieldset>
-  </div>
-  <div>
-    <fieldset>
-      <legend>Branch User</legend>
-      <div>
-        <input type="text" id="identity" name="identity" placeholder="User Id">
-      </div>
-      <div>
-        <button onclick="BranchUser()">Login</button>
-        <button onclick="BranchLogout()">Logout</button>
-      </div>
-    </fieldset>
-  </div>
-  <div>
-    <fieldset>
-      <legend>Branch Event</legend>
-      <div>
-        <input type="text" id="custom-action" name="custom-action" placeholder="Event Name">
-      </div>
-      <div>
-        <button onclick="BranchEvent()">Create</button>
-        <button onclick="BranchCommerce()">Commerce</button>
-      </div>
-    </fieldset>
-  </div>
-  <div>
-    <fieldset>
-      <legend>Branch Referral</legend>
-      <div>
-        <button onclick="BranchReferralsReward()">Reward</button>
-        <button onclick="BranchReferralsLoad()">Load</button>
-      </div>
-      <div>
-        <button onclick="BranchReferralsRedeem()">Redeem</button>
-        <button onclick="BranchReferralsHistory()">History</button>
-      </div>
-    </fieldset>
-  </div>
+      </section>
+      <input type="text" id="generated-url" placeholder="Deep link" readonly>
+  </fieldset>
+  <fieldset>
+    <legend>Branch Deep Link Data</legend>
+    <section>
+      <button onclick="BranchFirstData()">First</button>
+      <button onclick="BranchLatestData()">Latest</button>
+    </section>
+  </fieldset>
+  <fieldset>
+    <legend>Branch Content</legend>
+    <section>
+      <button onclick="BranchView()">Create</button>
+      <button onclick="BranchSpotlight()">Share</button>
+    </section>
+  </fieldset>
+  <fieldset>
+    <legend>Branch User</legend>
+    <input type="text" id="identity" name="identity" placeholder="User Id">
+    <section>
+      <button onclick="BranchUser()">Login</button>
+      <button onclick="BranchLogout()">Logout</button>
+    </section>
+  </fieldset>
+  <fieldset>
+    <legend>Branch Event</legend>
+    <input type="text" id="custom-action" name="custom-action" placeholder="Event Name">
+    <section>
+      <button onclick="BranchEvent()">Create</button>
+      <button onclick="BranchCommerce()">Commerce</button>
+    </section>
+  </fieldset>
+  <fieldset>
+    <legend>Branch Referral</legend>
+    <section>
+      <button onclick="BranchReferralsReward()">Reward</button>
+      <button onclick="BranchReferralsLoad()">Load</button>
+    </section>
+    <section>
+      <button onclick="BranchReferralsRedeem()">Redeem</button>
+      <button onclick="BranchReferralsHistory()">History</button>
+    </section>
+  </fieldset>
   <script type="text/javascript" src="cordova.js"></script>
   <script type="text/javascript" src="js/index.js"></script>
 </body>
