diff --git a/components/lenses/ResponseBodyRenderer.vue b/components/lenses/ResponseBodyRenderer.vue
index 0440ad976..095f92373 100644
--- a/components/lenses/ResponseBodyRenderer.vue
+++ b/components/lenses/ResponseBodyRenderer.vue
@@ -2,11 +2,11 @@
   <div>
     <tabs>
       <tab
-        v-for="lens in validLenses"
-        :id="lens.lensName"
+        v-for="(lens, index) in validLenses"
         :key="lens.lensName"
+        :id="lens.lensName"
         :label="lens.lensName"
-        :selected="lens.lensName === 'Raw'"
+        :selected="index == 0"
       >
         <component :is="lens.renderer" :response="response" />
       </tab>
diff --git a/helpers/lenses/lenses.js b/helpers/lenses/lenses.js
index 0f07a0d6f..f38f6f7bd 100644
--- a/helpers/lenses/lenses.js
+++ b/helpers/lenses/lenses.js
@@ -3,14 +3,7 @@ import rawLens from "./rawLens"
 import imageLens from "./imageLens"
 import htmlLens from "./htmlLens"
 
-const lenses = [
-  jsonLens,
-  imageLens,
-  htmlLens,
-
-  // Keep Raw Lens as the last option
-  rawLens,
-]
+const lenses = [jsonLens, imageLens, htmlLens, rawLens]
 
 function getSuitableLenses(response) {
   const result = []
diff --git a/pages/index.vue b/pages/index.vue
index 2c437939a..d06d9b388 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1425,13 +1425,13 @@ export default {
     collections: () => import("~/components/collections"),
     saveRequestAs: () => import("~/components/collections/saveRequestAs"),
     Editor: AceEditor,
-    environments: () => import("../components/environments"),
-    inputform: () => import("../components/firebase/inputform"),
-    notes: () => import("../components/firebase/feeds"),
-    login: () => import("../components/firebase/login"),
-    tabs: () => import("../components/ui/tabs"),
-    tab: () => import("../components/ui/tab"),
-    "response-renderer": () => import("../components/lenses/ResponseBodyRenderer"),
+    environments: () => import("~/components/environments"),
+    inputform: () => import("~/components/firebase/inputform"),
+    notes: () => import("~/components/firebase/feeds"),
+    login: () => import("~/components/firebase/login"),
+    tabs: () => import("~/components/ui/tabs"),
+    tab: () => import("~/components/ui/tab"),
+    "response-renderer": () => import("~/components/lenses/ResponseBodyRenderer"),
   },
   data() {
     return {