diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index d7a770d..5b30dd5 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -13,8 +13,9 @@
         android:id="@+id/connectButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/imageView1"
-        android:layout_centerHorizontal="true"
+        android:layout_alignLeft="@+id/startButton"
+        android:layout_alignRight="@+id/startButton"
+        android:layout_centerVertical="true"
         android:gravity="center"
         android:onClick="connectWithRobot"
         android:text="@string/robot_pair_button" />
@@ -23,21 +24,10 @@
         android:id="@+id/startButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/connectButton"
-        android:layout_alignRight="@+id/connectButton"
         android:layout_below="@+id/connectButton"
+        android:layout_centerHorizontal="true"
         android:gravity="center"
         android:onClick="startConnections"
         android:text="@string/start_button" />
 
-    <ImageView
-        android:id="@+id/imageView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="60dp"
-        android:contentDescription="@string/lens_icon"
-        android:src="@drawable/camera_lens" />
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java b/src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java
index feb3835..0dbd881 100644
--- a/src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java
+++ b/src/ve/ucv/ciens/ccg/nxtcam/MainActivity.java
@@ -37,7 +37,6 @@ import android.widget.Toast;
  * datagram carrying the string "NxtAR server here!" is received.
  * 
  * @author miky
- *
  */
 public class MainActivity extends Activity implements WifiOnDialogListener, ConnectRobotDialogListener{
 	// Cosntant fields.
@@ -107,6 +106,7 @@ public class MainActivity extends Activity implements WifiOnDialogListener, Conn
 
 	@Override
 	public void onDestroy(){
+		super.onDestroy();
 		if(btManager.isConnected()){
 			try{
 				btManager.stopConnection();