diff --git a/src/App.vue b/src/App.vue
index 1985815..a51fbb0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -145,15 +145,18 @@
 
         <v-row dense>
           <v-col :cols="12">
-            <v-btn x-small @click="jumptotits">Tits</v-btn>
-            <v-btn x-small @click="jumptopanties">Panties</v-btn>
-            <v-btn x-small @click="jumptopussy">Pussy</v-btn>
-            <v-btn x-small @click="jumptorubpussy">Rub Pussy</v-btn>
-            <v-btn x-small @click="jumptosextoy">Sex Toy</v-btn>
-            <v-btn x-small @click="jumptoclamps">Nipple Clamps</v-btn>
-            <v-btn x-small @click="jumptocandle">Candle</v-btn>
-            <v-btn x-small @click="jumptoassplay">Ass Play</v-btn>
-            <v-btn x-small @click="jumptoasstoy">Ass Toy</v-btn>
+            <template v-for="(l,i) in levels">
+              <v-btn  :key="i" v-if="l.jumptask && l.jumptask.type=='normal'" @click="leveljump(l.index)" x-small rounded>{{ l.jumptask.name }}</v-btn>
+            </template>
+          </v-col>
+        </v-row>
+
+
+        <v-row dense>
+          <v-col :cols="12">
+            <template v-for="(l,i) in levels">
+              <v-btn :key="i" v-if="l.jumptask && l.jumptask.type=='kinky'" @click="leveljump(l.index)" x-small rounded color="primary">{{ l.jumptask.name }}</v-btn>
+            </template>
           </v-col>
         </v-row>
 
@@ -209,7 +212,7 @@
         </v-row>
 
         <v-row>
-          <v-col :cols="6">
+          <v-col :cols="10">
           <div
               outlined
               class="levelcompliment font-weight-black">
@@ -325,51 +328,6 @@ export default {
       this.currentLevel = i;
       this.ready = true;
     },
-    jumptotits: function () {
-      this.ready = false;
-      this.currentLevel = 13;
-      this.ready = true;
-    },
-    jumptopanties: function () {
-      this.ready = false;
-      this.currentLevel = 30;
-      this.ready = true;
-    },
-    jumptopussy: function () {
-      this.ready = false;
-      this.currentLevel = 39;
-      this.ready = true;
-    },
-    jumptorubpussy: function () {
-      this.ready = false;
-      this.currentLevel = 49;
-      this.ready = true;
-    },
-    jumptosextoy: function () {
-      this.ready = false;
-      this.currentLevel = 74;
-      this.ready = true;
-    },
-    jumptoclamps: function () {
-      this.ready = false;
-      this.currentLevel = 84;
-      this.ready = true;
-    },
-    jumptocandle: function () {
-      this.ready = false;
-      this.currentLevel = 89;
-      this.ready = true;
-    },
-    jumptoassplay: function () {
-      this.ready = false;
-      this.currentLevel = 98;
-      this.ready = true;
-    },
-    jumptoasstoy: function () {
-      this.ready = false;
-      this.currentLevel = 105;
-      this.ready = true;
-    },
     /*startoverlay: function() {
       this.overlayimg = this.overlayselect;
       this.showoverlay = true;
@@ -490,6 +448,10 @@ export default {
           foreground: "assets/bg/boobdrop.webp",
           task: "Slowly do a boob drop together with your bra, shirt or hands",
           points: 30,
+          jumptask: {
+            name: "TITS",
+            type: "normal"
+          }
         },
         {
           title: "TITS - Boob drop each other",
@@ -592,6 +554,10 @@ export default {
           foreground: "assets/bg/showoffpanties.png",
           task: "Both show off front of panties",
           points: 45,
+          jumptask: {
+            name: "PANTIES",
+            type: "normal"
+          }
         },
         {
           title: "PANTIES - Rub over panties",
@@ -646,6 +612,10 @@ export default {
           foreground: "assets/bg/legsupshowpussy.png",
           task: "Lift your legs up and show off your pussies",
           points: 55,
+          jumptask: {
+            name: "PUSSY",
+            type: "normal"
+          }
         },
         {
           title: "PUSSY - legs back",
@@ -706,6 +676,10 @@ export default {
           foreground: "assets/bg/pussyrub.gif",
           task: "Both rub your pussy (1 min)",
           points: 55,
+          jumptask: {
+            name: "RUB PUSSY",
+            type: "normal"
+          }
         },
         {
           title: "PUSSY - Rub each others pussy",
@@ -856,6 +830,10 @@ export default {
           foreground: "assets/bg/toyrubpussy.webp",
           task: "Rub it over her pussy",
           points: 80,
+          jumptask: {
+            name: "SEX TOY",
+            type: "normal"
+          }
         },
         {
           title: "TOY - Slide in pussy (Girl 1)",
@@ -916,6 +894,10 @@ export default {
           foreground: "assets/bg/nippleclamps.png",
           task: "Clamp each others nipples (Binder Clips, Bobby Pins, Clothes Pins)",
           points: 300,
+          jumptask: {
+            name: "NIPPLE CLAMPS",
+            type: "kinky"
+          }
         },
         {
           title: "CLAMP - clamp lips",
@@ -946,6 +928,10 @@ export default {
           foreground: "assets/bg/candle.png",
           task: "Get a Candle & light it",
           points: 300,
+          jumptask: {
+            name: "CANDLE",
+            type: "kinky"
+          }
         },
         {
           title: "CANDLE - Tummy",
@@ -1000,6 +986,10 @@ export default {
           foreground: "assets/bg/asslickhelp1.gif",
           task: "Rim her asshole with your tongue (30 sec)",
           points: 300,
+          jumptask: {
+            name: "ASS PLAY",
+            type: "kinky"
+          }
         },
         {
           title: "ASS PLAY - Rimming (Girl 2)",
@@ -1042,6 +1032,10 @@ export default {
           foreground: "assets/bg/toyinasshelp1.webp",
           task: "Fuck her ass with a toy (30 sec)",
           points: 1000,
+          jumptask: {
+            name: "ASS TOY",
+            type: "normal"
+          }
         },
         {
           title: "ASS TOY - Fuck Ass (Girl 1)",