diff --git a/src/components/config/KeySelectButton.vue b/src/components/config/KeySelectButton.vue
new file mode 100644
index 0000000..dbbd369
--- /dev/null
+++ b/src/components/config/KeySelectButton.vue
@@ -0,0 +1,52 @@
+<template>
+  <button
+    class="flex-1 flex flex-col items-center py-2"
+    :class="{'text-black bg-zinc-200 hover:bg-zinc-100': selected,
+    'hover:bg-zinc-800 text-muted-foreground' : !selected}"
+    @click="$emit('select'); $refs.title.scramble()">
+    <img
+      draggable="false"
+      :src="icon" alt="connection-type-icon"
+      class="w-16 py-2"
+      :class="{'invert': invert && selected}">
+    <ScrambleText ref="title" :resize="false" class="text-xs text-wrap p-1" :text="title" />
+    <span>
+      <ArrowBigUp class="inline-block" />
+      <Badge
+        class="shadow-none text-wrap inline-block p-0.5 mx-1"
+        :class="{'bg-orange-400': selected, 'bg-zinc-400': !selected}">Space</Badge>+<Badge
+      class="shadow-none text-wrap inline-block p-0.5 mx-1"
+      :class="{'bg-orange-400': selected, 'bg-zinc-400': !selected}">E</Badge>
+    </span>
+  </button>
+</template>
+<script setup>
+import ScrambleText from '@/components/effects/ScrambleText.vue'
+import { Badge } from '@/components/ui/badge'
+import { ArrowBigUp } from 'lucide-vue-next'
+
+defineEmits(['select'])
+
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+  icon: {
+    type: [String, Object, Function],
+    default: '',
+  },
+  selected: {
+    type: Boolean,
+    default: false,
+  },
+  invert: {
+    type: Boolean,
+    default: true,
+  },
+  badge: {
+    type: [String, Object, Function],
+    default: '',
+  },
+})
+</script>
\ No newline at end of file
diff --git a/src/components/config/pages/HapticConfig.vue b/src/components/config/pages/HapticConfig.vue
index d70e1c6..43cdde7 100644
--- a/src/components/config/pages/HapticConfig.vue
+++ b/src/components/config/pages/HapticConfig.vue
@@ -53,7 +53,7 @@ import VfIcon from '@/assets/gui-ico/ico-vf.svg'
 import RcIcon from '@/assets/gui-ico/ico-rc.svg'
 import FeedbackTypeButton from '@/components/config/FeedbackTypeButton.vue'
 
-const feedbackType = ref('usb') // TODO: replace with actual value
+const feedbackType = ref('fineDetents') // TODO: replace with actual value
 
 const feedbackTypeOptions = {
   fineDetents: {
diff --git a/src/components/config/pages/MappingConfig.vue b/src/components/config/pages/MappingConfig.vue
index 7534807..6329597 100644
--- a/src/components/config/pages/MappingConfig.vue
+++ b/src/components/config/pages/MappingConfig.vue
@@ -1,54 +1,11 @@
 <template>
   <ConfigSection :title="$t('config_options.mapping_configuration.key_mapping.title')" :icon-component="Keyboard">
-    <Tabs default-value="fd">
-      <TabsList class="grid grid-cols-4 h-auto text-muted-foreground">
-        <TabsTrigger value="fd">
-          <div class="grid grid-flow-row auto-rows-max justify-items-center ">
-            <div class="size-16 mb-2">
-              <img src="../../../assets/gui-ico/ico-key-o.svg">
-            </div>
-            <span class="text-xs leading-3 text-wrap">
-                              {{ $t('config_options.mapping_configuration.key_mapping.switch.a') }}
-                              <Badge class="bg-orange-400 mt-2">Shift</Badge>
-                            </span>
-          </div>
-        </TabsTrigger>
-        <TabsTrigger value="cd">
-          <div class="grid grid-flow-row auto-rows-max justify-items-center">
-            <div class="size-16 mb-2">
-              <img src="../../../assets/gui-ico/ico-key.svg">
-            </div>
-            <span class="text-xs leading-3 text-wrap">
-                              {{ $t('config_options.mapping_configuration.key_mapping.switch.b') }}
-                              <Badge class="bg-zinc-400 mt-2">Fn1</Badge>
-                            </span>
-          </div>
-        </TabsTrigger>
-        <TabsTrigger value="vr">
-          <div class="grid grid-flow-row auto-rows-max justify-items-center">
-            <div class="size-16 mb-2">
-              <img src="../../../assets/gui-ico/ico-key-g.svg">
-            </div>
-            <span class="text-xs leading-3 text-wrap">
-                              {{ $t('config_options.mapping_configuration.key_mapping.switch.c') }}
-                              <Badge class="bg-zinc-400 mt-2">Fn2</Badge>
-                            </span>
-          </div>
-        </TabsTrigger>
-        <TabsTrigger value="rt">
-          <div class="grid grid-flow-row auto-rows-max justify-items-center">
-            <div class="size-16 mb-2">
-              <img src="../../../assets/gui-ico/ico-key-d.svg">
-            </div>
-            <span class="text-xs leading-3 text-wrap">
-                              {{ $t('config_options.mapping_configuration.key_mapping.switch.d') }}
-                              <Badge class="bg-zinc-400 mt-2">M0</Badge>
-                            </span>
-          </div>
-        </TabsTrigger>
-      </TabsList>
-
-    </Tabs>
+    <div class="flex font-heading">
+      <KeySelectButton
+        v-for="(option, key) in keySelectOptions" :key="key" :title="$t(option.titleKey)"
+        :invert="option.invert" :badge="option.badge"
+        :icon="option.icon" :selected="selectedKey===key" @select="selectedKey=key" />
+    </div>
     <Separator />
     <Command>
 
@@ -181,19 +138,37 @@ import {
   CommandList, CommandSeparator,
 } from '@/components/ui/command/index.js'
 import { Slider } from '@/components/ui/slider/index.js'
-import { KeyboardMusic, Squircle, Keyboard, GaugeCircle, AudioLines, Power } from 'lucide-vue-next'
+import { KeyboardMusic, Squircle, Keyboard, GaugeCircle, Play, Pause } from 'lucide-vue-next'
 import ConfigSection from '@/components/config/ConfigSection.vue'
-</script>
-<style scoped>
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  margin: 0;
-}
+import KeyO from '@/assets/gui-ico/ico-key-o.svg'
+import Key from '@/assets/gui-ico/ico-key.svg'
+import KeyG from '@/assets/gui-ico/ico-key-g.svg'
+import KeyD from '@/assets/gui-ico/ico-key-d.svg'
+import { ref } from 'vue'
+import KeySelectButton from '@/components/config/KeySelectButton.vue'
 
-/* Firefox */
-input[type=number] {
-  -moz-appearance: textfield;
-  text-align: center;
+const selectedKey = ref('a') // TODO: replace with actual value
+
+const keySelectOptions = {
+  a: {
+    icon: KeyO,
+    titleKey: 'config_options.mapping_configuration.key_mapping.switch.a',
+    invert: false,
+  },
+  b: {
+    icon: Key,
+    titleKey: 'config_options.mapping_configuration.key_mapping.switch.b',
+    invert: true,
+  },
+  c: {
+    icon: KeyG,
+    titleKey: 'config_options.mapping_configuration.key_mapping.switch.c',
+    invert: true,
+  },
+  d: {
+    icon: KeyD,
+    titleKey: 'config_options.mapping_configuration.key_mapping.switch.d',
+    invert: true,
+  },
 }
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 805bdfe..10354dc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,7 @@ const createWindow = () => {
   const mainWindow = new BrowserWindow({
     width: 1024,
     height: 768,
-    autoHideMenuBar: true,
-    frame: false,
+    titleBarStyle: 'hidden',
     icon: path.join(__dirname, `/assets/favicon.png`),
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),