diff --git a/lnbits/extensions/splitpayments/static/js/index.js b/lnbits/extensions/splitpayments/static/js/index.js
index 32fe20c7..94ece07b 100644
--- a/lnbits/extensions/splitpayments/static/js/index.js
+++ b/lnbits/extensions/splitpayments/static/js/index.js
@@ -63,8 +63,14 @@ new Vue({
       if (isPercent) {
         if (this.targets[index].percent > 100) this.targets[index].percent = 100
         if (this.targets[index].percent < 0) this.targets[index].percent = 0
+        this.targets[index].tag = ''
       }
 
+      // not percentage
+      if (!isPercent) {
+        this.targets[index].percent = 0
+      }
+      
       // remove empty lines (except last)
       if (this.targets.length >= 2) {
         for (let i = this.targets.length - 2; i >= 0; i--) {
@@ -72,6 +78,7 @@ new Vue({
           if (
             (!target.wallet || target.wallet.trim() === '') &&
             (!target.alias || target.alias.trim() === '') &&
+            (!target.tag || target.tag.trim() === '') &&
             !target.percent
           ) {
             this.targets.splice(i, 1)
@@ -81,7 +88,7 @@ new Vue({
 
       // add a line at the end if the last one is filled
       let last = this.targets[this.targets.length - 1]
-      if (last.wallet && last.wallet.trim() !== '' && last.percent > 0) {
+      if (last.wallet && last.wallet.trim() !== '') {
         this.targets.push({})
       }
 
@@ -113,6 +120,7 @@ new Vue({
 
       // overwrite so changes appear
       this.targets = this.targets
+      console.log(this.targets)
     },
     saveTargets() {
       LNbits.api
diff --git a/lnbits/extensions/splitpayments/templates/splitpayments/index.html b/lnbits/extensions/splitpayments/templates/splitpayments/index.html
index e86842e9..7ea76339 100644
--- a/lnbits/extensions/splitpayments/templates/splitpayments/index.html
+++ b/lnbits/extensions/splitpayments/templates/splitpayments/index.html
@@ -31,54 +31,63 @@
             style="flex-wrap: nowrap"
             v-for="(target, t) in targets"
           >
-          <q-toggle
-      :false-value="'split'"
-      :true-value="'tag'"
-      color="primary"
-      label=""
-      v-model="target.method"
-      :label="'Split funds by %, or send funds by tag' || `${target.method}`"
-    ></q-toggle>
-            <q-select
-              dense
-              :options="g.user.wallets.filter(w => w.id !== selectedWallet.id).map(o => ({name: o.name, value: o.id}))"
-              v-model="target.wallet"
-              label="Wallet"
-              :hint="t === targets.length - 1 ? 'A wallet ID or invoice key.' : undefined"
-              @input="targetChanged(false)"
-              option-label="name"
-              style="width: 1000px"
-              new-value-mode="add-unique"
-              use-input
-              input-debounce="0"
-              emit-value
-            ></q-select>
-            <q-input
+          <q-input
               dense
               outlined
               v-model="target.alias"
               label="Alias"
               :hint="t === targets.length - 1 ? 'A name to identify this target wallet locally.' : undefined"
               @input="targetChanged(false)"
+              style="width: 150px"
             ></q-input>
             
             <q-input
-              v-if="target.method == 'split'"
+              dense
+              v-model="target.wallet"
+              label="Wallet"
+              :hint="t === targets.length - 1 ? 'A wallet ID or invoice key.' : undefined"
+              @input="targetChanged(false)"
+              option-label="name"
+              style="width: 300px"
+              new-value-mode="add-unique"
+              use-input
+              input-debounce="0"
+              emit-value
+            ></q-input>
+           
+            
+            <q-toggle
+            :false-value="'split'"
+            :true-value="'tag'"
+            color="primary"
+            label=""
+            style="width: 180px"
+            v-model="target.method"
+            :label="`${target.method}` === 'tag' ? 'Send funds by tag' : `${target.method}` === 'split' ? 'Split funds by %' : 'Split/tag?'"
+          ></q-toggle>
+
+            <q-input
+              v-if="target.method == 'tag' || target.tag != null"
+              style="width: 150px"
+              dense
+              outlined
+              v-model.number="target.tag"
+              label="Tag name"
+              suffix="#"
+              @input="percentageChanged(false, t)"
+            ></q-input>
+
+            <q-input
+              v-else-if="target.method == 'split' || target.percent >= 0"
+              style="width: 150px"
               dense
               outlined
               v-model.number="target.percent"
-              label="Split Share"
+              label="split"
               suffix="%"
               @input="percentageChanged(true, t)"
             ></q-input>
-            <q-input
-            v-else
-            dense
-            outlined
-            v-model.number="target.tag"
-            label="Forward by tag"
-            suffix="#"
-          ></q-input>
+
           </div>
 
           <div class="row justify-evenly q-pa-lg">