diff --git a/components/history.vue b/components/history.vue
index eb09bb796..360c04dc3 100644
--- a/components/history.vue
+++ b/components/history.vue
@@ -2,7 +2,6 @@
   <pw-section class="gray" label="History">
     <ul>
       <li id="filter-history">
-        <label for="filter-history-input">Search History</label>
         <input id="filter-history-input" type="text" placeholder="search history" :readonly="history.length === 0 || isClearingHistory" v-model="filterText">
       </li>
     </ul>
diff --git a/pages/index.vue b/pages/index.vue
index 5d122eccb..d8e57da1a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,17 +1,32 @@
 <template>
   <div class="page">
     <pw-section class="yellow" label="Import" ref="import">
+      <ul>
+        <li>
       <button id="show-modal" @click="showModal = true">Import cURL</button>
+        </li>
+      </ul>
       <import-modal v-if="showModal" @close="showModal = false">
         <div slot="header">
-          <h3 class="title">Import cURL</h3>
+          <ul>
+            <li>
+              <h3 class="title">Import cURL</h3>
+            </li>
+          </ul>
         </div>
         <div slot="body">
-          <textarea id="import-text" autofocus rows="8">
-          </textarea>
+          <ul>
+            <li>
+              <textarea id="import-text" autofocus rows="8"></textarea>
+            </li>
+          </ul>
         </div>
         <div slot="footer">
-          <button class="modal-default-button" @click="handleImport">OK</button>
+          <ul>
+            <li>
+              <button class="modal-default-button" @click="handleImport">Import</button>
+            </li>
+          </ul>
         </div>
       </import-modal>
     </pw-section>
@@ -227,7 +242,6 @@
       </ol>
       <ul>
         <li>
-          <label for="add">Action</label>
           <button @click="addRequestHeader" name="add">Add</button>
         </li>
       </ul>
@@ -255,7 +269,6 @@
       </ol>
       <ul>
         <li>
-          <label for="add">Action</label>
           <button @click="addRequestParam" name="add">Add</button>
         </li>
       </ul>