diff --git a/assets/css/styles.scss b/assets/css/styles.scss
index 844b690b3..b14cb7268 100644
--- a/assets/css/styles.scss
+++ b/assets/css/styles.scss
@@ -26,7 +26,6 @@ $responsiveWidth: 720px;
   box-sizing: border-box;
   outline: 0;
   border: 0;
-  font-family: "Poppins", "Roboto", "Noto", sans-serif;
 }
 
 a {
@@ -44,6 +43,7 @@ body {
   -webkit-tap-highlight-color: transparent;
   -webkit-touch-callout: none;
   user-select: none;
+  font-family: "Poppins", "Roboto", "Noto", sans-serif;
 }
 
 h1,
@@ -96,6 +96,7 @@ button {
   color: var(--act-color);
   font-weight: 700;
   font-size: 16px;
+  font-family: "Poppins", "Roboto", "Noto", sans-serif;
   cursor: pointer;
   transition: all 0.2s ease-in-out;
   fill: var(--act-color);
@@ -308,7 +309,7 @@ label {
 ul,
 ol {
   display: flex;
-  margin: 8px 0 0;
+  margin: 4px 0 4px;
   padding: 0;
   list-style-type: none;
 }
@@ -400,7 +401,8 @@ fieldset#history {
     span {
       position: absolute;
       top: 44px;
-      right: 20px;
+      right: 12px;
+      font-weight: 700;
       font-family: monospace, monospace;
     }
   }
diff --git a/pages/index.vue b/pages/index.vue
index 8dba39050..55742a89a 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -132,13 +132,13 @@
           </autocomplete>
           <span>
             <pw-toggle :on="rawInput" @change="rawInput = !rawInput">
-              Raw input {{ rawInput ? "enabled" : "disabled" }}
+              Raw Input {{ rawInput ? "Enabled" : "Disabled" }}
             </pw-toggle>
           </span>
         </li>
       </ul>
       <div v-if="!rawInput">
-        <ol v-for="(param, index) in bodyParams" :key="index">
+        <ul v-for="(param, index) in bodyParams" :key="index">
           <li>
             <label :for="'bparam'+index">Key {{index + 1}}</label>
             <input :name="'bparam'+index" v-model="param.key" @keyup.prevent="setRouteQueryState" autofocus>
@@ -157,10 +157,9 @@
               </button>
             </li>
           </div>
-        </ol>
+        </ul>
         <ul>
           <li>
-            <label for="addrequest">Action</label>
             <button @click="addRequestBodyParam" name="addrequest">Add New</button>
           </li>
         </ul>
@@ -172,7 +171,12 @@
         </ul>
       </div>
       <div v-else>
-        <textarea @keydown="formatRawParams" rows="8" v-model="rawParams" v-textarea-auto-height="rawParams"></textarea>
+        <ul>
+          <li>
+            <label for="rawBody">Raw Request Body</label>
+            <textarea name="rawBody" @keydown="formatRawParams" rows="8" v-model="rawParams" v-textarea-auto-height="rawParams"></textarea>
+          </li>
+        </ul>
       </div>
     </pw-section>
     <pw-section class="purple" id="response" label="Response" ref="response">
@@ -261,7 +265,7 @@
       </ul>
     </pw-section>
     <pw-section class="orange" collapsed label="Headers">
-      <ol v-for="(header, index) in headers" :key="index">
+      <ul v-for="(header, index) in headers" :key="index">
         <li>
           <label :for="'header'+index">Header {{index + 1}}</label>
           <input :name="'header'+index" v-model="header.key" @keyup.prevent="setRouteQueryState" autofocus>
@@ -280,7 +284,7 @@
             </button>
           </li>
         </div>
-      </ol>
+      </ul>
       <ul>
         <li>
           <button @click="addRequestHeader" name="add">Add New</button>
@@ -294,7 +298,7 @@
       </ul>
     </pw-section>
     <pw-section class="pink" collapsed label="Parameters">
-      <ol v-for="(param, index) in params" :key="index">
+      <ul v-for="(param, index) in params" :key="index">
         <li>
           <label :for="'param'+index">Parameter {{index + 1}}</label>
           <input :name="'param'+index" v-model="param.key" autofocus>
@@ -313,7 +317,7 @@
             </button>
           </li>
         </div>
-      </ol>
+      </ul>
       <ul>
         <li>
           <button @click="addRequestParam" name="add">Add New</button>
diff --git a/pages/settings.vue b/pages/settings.vue
index 7786e0a98..cb0634669 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -26,7 +26,7 @@
           <h3 class="title">Frames</h3>
           <span>
             <pw-toggle :on="!settings.DISABLE_FRAME_COLORS" @change="toggleSetting('DISABLE_FRAME_COLORS')">
-              Multi-color {{ settings.DISABLE_FRAME_COLORS ? "disabled" : "enabled" }}
+              Multi-color {{ settings.DISABLE_FRAME_COLORS ? "Disabled" : "Enabled" }}
             </pw-toggle>
           </span>
         </li>