diff --git a/build/appicon.png b/build/appicon.png
index 63617fe..51756df 100644
Binary files a/build/appicon.png and b/build/appicon.png differ
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0666c01..7985269 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -19,10 +19,16 @@
       },
       "devDependencies": {
         "@babel/types": "^7.18.10",
+        "@types/node": "^18.11.18",
         "@vitejs/plugin-vue": "^3.0.3",
         "typescript": "^4.6.4",
         "vite": "^3.0.7",
         "vue-tsc": "^0.39.5"
+      },
+      "engines": {
+        "node": "^18 || ^16 || ^14.19",
+        "npm": ">= 6.13.4",
+        "yarn": ">= 1.21.1"
       }
     },
     "node_modules/@babel/helper-string-parser": {
@@ -128,6 +134,12 @@
         "monaco-editor": ">= 0.21.0 < 1"
       }
     },
+    "node_modules/@types/node": {
+      "version": "18.11.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz",
+      "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
+      "dev": true
+    },
     "node_modules/@vitejs/plugin-vue": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-3.2.0.tgz",
@@ -1074,6 +1086,12 @@
         "state-local": "^1.0.6"
       }
     },
+    "@types/node": {
+      "version": "18.11.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz",
+      "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==",
+      "dev": true
+    },
     "@vitejs/plugin-vue": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-3.2.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 4cbe898..cba6f2b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -20,10 +20,16 @@
     "vue": "^3.2.37"
   },
   "devDependencies": {
+    "@types/node": "^18.11.18",
     "@babel/types": "^7.18.10",
     "@vitejs/plugin-vue": "^3.0.3",
     "typescript": "^4.6.4",
     "vite": "^3.0.7",
     "vue-tsc": "^0.39.5"
+  },
+  "engines": {
+    "node": "^18 || ^16 || ^14.19",
+    "npm": ">= 6.13.4",
+    "yarn": ">= 1.21.1"
   }
 }
diff --git a/frontend/package.json.md5 b/frontend/package.json.md5
index cb25212..d28b97b 100755
--- a/frontend/package.json.md5
+++ b/frontend/package.json.md5
@@ -1 +1 @@
-c89c3e260822cde2a0954e98d00d2d2b
\ No newline at end of file
+c2400366737b24b88ff15be9b2118889
\ No newline at end of file
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 6b06e2b..d622a58 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,7 +2,7 @@
 import dayjs from 'dayjs'
 import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'
-import { reactive, onMounted, computed } from 'vue'
+import { reactive, onMounted, computed, ref } from 'vue'
 import { EventsOn } from '@wails/runtime'
 import { GetConfig } from '@wails/go/main/App'
 import JsonFormatter from '@/components/pages/JsonFormatter.vue'
@@ -11,8 +11,6 @@ import Tinker from '@/components/pages/Tinker.vue'
 import ProjectSettings from '@/components/pages/ProjectSettings.vue'
 import Toast from 'primevue/toast'
 import Toolbar from 'primevue/toolbar'
-import TabView from 'primevue/tabview'
-import TabPanel from 'primevue/tabpanel'
 import Tag from 'primevue/tag'
 import 'primevue/resources/themes/saga-blue/theme.css'
 import 'primevue/resources/primevue.min.css'
@@ -31,6 +29,8 @@ const tabs = [
   { id: "beam", title: 'Beam', content: Beam },
 ]
 
+const activeTab = ref(tabs[0].id)
+
 const data = reactive({
   currentSection: "app", // app / projectSettings
   tabs: tabs,
@@ -105,14 +105,21 @@ onMounted(() => refreshAppConfig())
         </template>
       </Toolbar>
 
-      <TabView v-if="data.currentSection === 'app'">
-        <TabPanel v-for="tab in tabs" :header="tab.title" :key="tab.id">
-          <div class="component-wrapper h-full">
-            <Beam v-if="tab.id === 'beam'" :messages="data.messages" class="component" @clear-beam-messages="clearMessages" />
-            <component v-else class="component" :is="tab.content" />
-          </div>
-        </TabPanel>
-      </TabView>
+      <div class="flex pl-2 border-gray-300 bg-gray-100" style="border-bottom: solid 2px;">
+        <div v-for="tab in tabs"
+          :style="[activeTab == tab.id ? 'border-bottom: solid 2px' : '', 'position: relative; top: 2px;']"
+          :class="[activeTab == tab.id ? 'text-blue-500' : '', 'px-3 py-3 font-medium cursor-pointer']"
+          @click="activeTab = tab.id"
+        >
+          {{ tab.title }}
+        </div>
+      </div>
+      <div v-if="data.currentSection === 'app'" class="component-wrapper h-full p-4">
+        <Beam v-if="activeTab === 'beam'" :messages="data.messages" class="component" @clear-beam-messages="clearMessages" />
+        <Tinker v-else-if="activeTab === 'tinker'" class="component" />
+        <JsonFormatter v-else-if="activeTab === 'jsonformatter'" class="component" />
+      </div>
+
       <div v-else-if="data.currentSection === 'projectSettings'" class="component-wrapper pb-5 h-full m-3">
         <ProjectSettings
           :app-config="data.appConfig"
diff --git a/frontend/src/env.d.ts b/frontend/src/env.d.ts
new file mode 100644
index 0000000..7739e25
--- /dev/null
+++ b/frontend/src/env.d.ts
@@ -0,0 +1,5 @@
+declare namespace NodeJS {
+  interface ProcessEnv {
+    NODE_ENV: string;
+  }
+}
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 41a41c5..5f408e9 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,6 +1,6 @@
-import {createApp} from 'vue'
+import { createApp } from 'vue'
 import App from './App.vue'
-import PrimeVue from 'primevue/config';
+import PrimeVue from 'primevue/config'
 import ToastService from 'primevue/toastservice'
 
 const app = createApp(App)
diff --git a/main.go b/main.go
index b27bff6..fc72292 100644
--- a/main.go
+++ b/main.go
@@ -10,6 +10,7 @@ import (
 	"github.com/jsawo/renfield/tinker"
 	"github.com/wailsapp/wails/v2"
 	"github.com/wailsapp/wails/v2/pkg/options"
+	"github.com/wailsapp/wails/v2/pkg/options/linux"
 )
 
 var (
@@ -21,6 +22,9 @@ var (
 //go:embed all:frontend/dist
 var assets embed.FS
 
+//go:embed build/appicon.png
+var icon []byte
+
 func main() {
 	config.Load()
 	appService = NewApp()
@@ -34,12 +38,19 @@ func main() {
 		Assets:           assets,
 		BackgroundColour: &options.RGBA{R: 27, G: 38, B: 54, A: 1},
 		OnStartup:        appStartup,
-		WindowStartState: options.Minimised,
 		Bind: []interface{}{
 			appService,
 			tinkerService,
 			jsonFormatter,
 		},
+		Linux: &linux.Options{
+			Icon:                icon,
+			WindowIsTranslucent: false,
+		},
+		// WindowStartState: options.Minimised,
+		// Debug: options.Debug{
+		// 	OpenInspectorOnStartup: true,
+		// },
 	})
 
 	if err != nil {