diff --git a/app/app-release.apk b/app/app-release.apk
index 9f6667b..811bdbd 100755
Binary files a/app/app-release.apk and b/app/app-release.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index fa425ad..bbb7d80 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.ericsson.uecontrol"
         minSdkVersion 15
         targetSdkVersion 19
-        versionCode 11
-        versionName "1.0.11"
+        versionCode 12
+        versionName "1.0.12"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
index 6df5b02..9a0e53e 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/UeControlExecutor.java
@@ -82,7 +82,11 @@ public class UeControlExecutor implements Runnable, UeBehaviour.DataHandledListe
         // Wait for the execution to finnish
         if(isRunning()){
             synchronized (thread){
-                try { thread.wait(); }catch(InterruptedException e) {log.error(null,e);}
+                try {
+                    thread.wait();
+                    while(isRunning()) // Just to make sure it has stopped
+                        Thread.sleep(10);
+                }catch(InterruptedException e) {log.error(null,e);}
             }
         }
     }
diff --git a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSendSMS.java b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSendSMS.java
index b831f61..44f32d3 100755
--- a/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSendSMS.java
+++ b/app/src/main/java/com/ericsson/uecontrol/core/behaviour/UeBehaviourSendSMS.java
@@ -36,16 +36,6 @@ public class UeBehaviourSendSMS extends UeBehaviour{
     private transient MessageStatus status;
     private transient Exception exception;
 
-    private transient BroadcastReceiver sentBroadcastReceiver = new BroadcastReceiver() {
-        public void onReceive(Context arg0, Intent arg1) {
-            setSendingStatus(getResultCode());
-        }
-    };
-    private transient BroadcastReceiver deliveryBroadcastReceiver = new BroadcastReceiver() {
-        public void onReceive(Context arg0, Intent arg1) {
-            setDeliveryStatus(getResultCode());
-        }
-    };
 
     @Override
     protected void execute() throws Exception {
@@ -60,8 +50,19 @@ public class UeBehaviourSendSMS extends UeBehaviour{
         PendingIntent deliveredPI = PendingIntent.getBroadcast(
                 context, 0, new Intent(INTENT_ACTION_DELIVERED), 0);
 
+        BroadcastReceiver sentBroadcastReceiver = new BroadcastReceiver() {
+            public void onReceive(Context arg0, Intent arg1) {
+                setSendingStatus(getResultCode());
+            }
+        };
+        BroadcastReceiver deliveryBroadcastReceiver = new BroadcastReceiver() {
+            public void onReceive(Context arg0, Intent arg1) {
+                setDeliveryStatus(getResultCode());
+            }
+        };
         context.registerReceiver(sentBroadcastReceiver, new IntentFilter(INTENT_ACTION_SENT));
         context.registerReceiver(deliveryBroadcastReceiver, new IntentFilter(INTENT_ACTION_DELIVERED));
+        Thread.sleep(SLEEP_PERIOD);
 
         // Send message
         log.debug("Sending message");
@@ -71,10 +72,12 @@ public class UeBehaviourSendSMS extends UeBehaviour{
 
         // Wait for the message sending
         log.debug("Waiting for message delivery");
-        while(status != MessageStatus.MESSAGE_DELIVERED ||
+        while(status != MessageStatus.MESSAGE_DELIVERED &&
                 status != MessageStatus.MESSAGE_CANCELED){
             if(status == MessageStatus.MESSAGE_SENT)
                 this.setProgress(2/3f);
+            if(stopExecution())
+                break;
             Thread.sleep(SLEEP_PERIOD);
         }
         this.setProgress(1f);
diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/util/DynamicListView.java b/app/src/main/java/com/ericsson/uecontrol/gui/util/DynamicListView.java
index 18aa29f..0bb3001 100755
--- a/app/src/main/java/com/ericsson/uecontrol/gui/util/DynamicListView.java
+++ b/app/src/main/java/com/ericsson/uecontrol/gui/util/DynamicListView.java
@@ -267,7 +267,7 @@ public class DynamicListView extends ListView {
                     int deltaY = mLastEventY - mDownY;
 
                     if (mMode == TouchMode.UNKNOWN) {
-                        if (Math.abs(deltaX) > 50 || Math.abs(deltaY) > 50) {
+                        if (Math.abs(deltaX) > 70 || Math.abs(deltaY) > 50) {
                             if (Math.abs(deltaX) >= Math.abs(deltaY))
                                 mMode = TouchMode.REMOVE;
                             if (Math.abs(deltaX) < Math.abs(deltaY) && mDownX < SWAP_OFFSET)