diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java
index 20484f1..50c9f6f 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/dispatch/SDMobileActivity.java
@@ -737,10 +737,10 @@ public class SDMobileActivity extends Activity {
 		Dialog dialogInfo = new Dialog(context);
 		dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		dialogInfo.setContentView(R.layout.dialog_login);
-		TextView textTitle = (TextView) dialogInfo.findViewById(R.id.textTitle);
-		TextView text = (TextView) dialogInfo.findViewById(R.id.text);
-		TextView text2 = (TextView) dialogInfo.findViewById(R.id.text2);
-		ImageView image = (ImageView) dialogInfo.findViewById(R.id.image);
+		TextView textTitle = dialogInfo.findViewById(R.id.textTitle);
+		TextView text = dialogInfo.findViewById(R.id.text);
+		TextView text2 = dialogInfo.findViewById(R.id.text2);
+		ImageView image = dialogInfo.findViewById(R.id.image);
 
 		textTitle.setText(getString(R.string.connectionError));
 		image.setImageResource(R.drawable.error);
diff --git a/safeDispatch/src/main/res/layout-large/row_livevehicle.xml b/safeDispatch/src/main/res/layout-large/row_livevehicle.xml
index 57d51c0..01e3748 100644
--- a/safeDispatch/src/main/res/layout-large/row_livevehicle.xml
+++ b/safeDispatch/src/main/res/layout-large/row_livevehicle.xml
@@ -31,10 +31,10 @@
         android:paddingLeft="3dp"
 		android:layout_weight="1"/>
     <LinearLayout 
-        	android:id="@+id/linearLayoutChecked"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0"
-		    android:background="@drawable/checked">
-    </LinearLayout>
+		android:id="@+id/linearLayoutChecked"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:background="@drawable/checked"
+		android:orientation="horizontal" />
 </LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout-large/tabsetup.xml b/safeDispatch/src/main/res/layout-large/tabsetup.xml
index 63dcebb..8e2d5e0 100644
--- a/safeDispatch/src/main/res/layout-large/tabsetup.xml
+++ b/safeDispatch/src/main/res/layout-large/tabsetup.xml
@@ -32,7 +32,6 @@
 			                android:layout_height="wrap_content"
 			                android:text="@string/serverIP"
 			                android:textAppearance="?android:attr/textAppearanceMedium"
-			                android:textColor="#FFFFFF"
 			                android:textStyle="bold"
 			                android:layout_gravity="center_vertical"
 			                android:gravity="center_vertical|right"
@@ -67,7 +66,6 @@
 			                android:layout_height="wrap_content"
 			                android:text="@string/serverPort"
 			                android:textAppearance="?android:attr/textAppearanceMedium"
-			                android:textColor="#FFFFFF"
 			                android:textStyle="bold"
 			                android:gravity="center_vertical|right"
 			                android:layout_gravity="center_vertical|right"
@@ -112,7 +110,6 @@
 				                android:layout_height="wrap_content"
 				                android:text="@string/configName"
 				                android:textAppearance="?android:attr/textAppearanceMedium"
-				                android:textColor="#FFFFFF"
 				                android:textStyle="bold"
 				                android:gravity="center_vertical|right"
 				                android:layout_gravity="center_vertical"/>
@@ -181,7 +178,6 @@
 			            android:text="@string/language"
 			            android:textAppearance="?android:attr/textAppearanceMedium"
 			            android:textStyle="bold"
-			            android:textColor="#FFFFFF"
 			            android:gravity="right"
 			            android:layout_gravity="center_vertical"/>
 					<LinearLayout
diff --git a/safeDispatch/src/main/res/layout/balloonname_overlay.xml b/safeDispatch/src/main/res/layout/balloonname_overlay.xml
index 2d0176a..de8981c 100644
--- a/safeDispatch/src/main/res/layout/balloonname_overlay.xml
+++ b/safeDispatch/src/main/res/layout/balloonname_overlay.xml
@@ -7,9 +7,9 @@
 	android:padding="2dp"
 	android:background="@drawable/style_nameoverlay">
 
-						<TextView android:layout_height="wrap_content"
-							android:layout_width="fill_parent" 
-							android:id="@+id/balloon_vehicle_name"
-							android:textSize="12dip"
-							android:textColor="#FF000000"></TextView>
+	<TextView android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:id="@+id/balloon_vehicle_name"
+		android:textSize="12dip"
+		android:textColor="#FF000000" />
 </LinearLayout>
diff --git a/safeDispatch/src/main/res/layout/dialog.xml b/safeDispatch/src/main/res/layout/dialog.xml
index 59a5863..ab831c8 100644
--- a/safeDispatch/src/main/res/layout/dialog.xml
+++ b/safeDispatch/src/main/res/layout/dialog.xml
@@ -24,14 +24,12 @@
 		              android:layout_height="wrap_content"
 		              android:paddingTop="8dp"
 		              android:textSize="18dp"
-		              android:textColor="#FFFFFF"
 		              />
 		    <TextView android:id="@+id/text2"
 		              android:layout_width="wrap_content"
 		              android:layout_height="wrap_content"
 		              android:paddingTop="8dp"
 		              android:textSize="18dp"
-		              android:textColor="#FFFFFF"
 		              />
      </LinearLayout>
 </LinearLayout>
diff --git a/safeDispatch/src/main/res/layout/dialog_login.xml b/safeDispatch/src/main/res/layout/dialog_login.xml
index 681d913..23ed11e 100644
--- a/safeDispatch/src/main/res/layout/dialog_login.xml
+++ b/safeDispatch/src/main/res/layout/dialog_login.xml
@@ -11,7 +11,7 @@
          android:paddingTop="2dp"
          android:text="TITLE"
          android:textAppearance="?android:attr/textAppearanceLarge" 
-         android:textColor="#FFFFFF"
+         android:textColor="@color/black"
          />
     <LinearLayout
               android:id="@+id/layout_horizontal"
@@ -40,7 +40,6 @@
 			              android:paddingTop="8dp"
 			              android:text="Row1"
 			              android:textAppearance="?android:attr/textAppearanceLarge" 
-			              android:textColor="#FFFFFF"
 			              />
 			    <TextView android:id="@+id/text2"
 			              android:layout_width="wrap_content"
@@ -48,7 +47,6 @@
 			              android:paddingTop="8dp"
 			              android:textAppearance="?android:attr/textAppearanceMedium" 
 			              android:text="Row2"
-			              android:textColor="#FFFFFF"
 			              />
 	     </LinearLayout>
 	</LinearLayout>
diff --git a/safeDispatch/src/main/res/layout/dialogdatepicker.xml b/safeDispatch/src/main/res/layout/dialogdatepicker.xml
index 3e976bf..e743eaa 100644
--- a/safeDispatch/src/main/res/layout/dialogdatepicker.xml
+++ b/safeDispatch/src/main/res/layout/dialogdatepicker.xml
@@ -61,4 +61,4 @@
 		        android:textSize="16dp" />
 		    
      </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/login_h.xml b/safeDispatch/src/main/res/layout/login_h.xml
index e5b2af1..0081efc 100644
--- a/safeDispatch/src/main/res/layout/login_h.xml
+++ b/safeDispatch/src/main/res/layout/login_h.xml
@@ -217,13 +217,13 @@
 	
 	
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
-			        android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
-			        android:visibility="gone"
-			        android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="true" />
+		android:id="@+id/imageLoading"
+		android:layout_width="64dp"
+		android:layout_height="64dp"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="0"
+		android:visibility="gone"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true" />
 	
 </RelativeLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/main_before.xml b/safeDispatch/src/main/res/layout/main_before.xml
index aed4d79..f1d4db5 100644
--- a/safeDispatch/src/main/res/layout/main_before.xml
+++ b/safeDispatch/src/main/res/layout/main_before.xml
@@ -209,8 +209,6 @@
 			</LinearLayout>
 		</LinearLayout>
     </LinearLayout>
-    
-   
 
      <RelativeLayout
 		        android:id="@+id/frameLayoutLanguage"
@@ -221,20 +219,16 @@
 		        android:layout_alignParentBottom="true"
 		        android:layout_gravity="right" 
 		        android:paddingBottom="6dp"
-		        android:layout_toLeftOf="@+id/frameLayout13">
-	</RelativeLayout>
+		        android:layout_toLeftOf="@+id/frameLayout13" />
 
-	
-	
-	
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
-			        android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
-			        android:visibility="gone"
-			        android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="true" />
+		android:id="@+id/imageLoading"
+		android:layout_width="64dp"
+		android:layout_height="64dp"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="0"
+		android:visibility="gone"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true" />
 	
 </RelativeLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/row_livevehicle.xml b/safeDispatch/src/main/res/layout/row_livevehicle.xml
index 57d51c0..01e3748 100644
--- a/safeDispatch/src/main/res/layout/row_livevehicle.xml
+++ b/safeDispatch/src/main/res/layout/row_livevehicle.xml
@@ -31,10 +31,10 @@
         android:paddingLeft="3dp"
 		android:layout_weight="1"/>
     <LinearLayout 
-        	android:id="@+id/linearLayoutChecked"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0"
-		    android:background="@drawable/checked">
-    </LinearLayout>
+		android:id="@+id/linearLayoutChecked"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:background="@drawable/checked"
+		android:orientation="horizontal" />
 </LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/spinner.xml b/safeDispatch/src/main/res/layout/spinner.xml
index b1f3f07..4e36420 100644
--- a/safeDispatch/src/main/res/layout/spinner.xml
+++ b/safeDispatch/src/main/res/layout/spinner.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal">
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<ImageView
-			android:id="@+id/icon"
+		android:src="@mipmap/ic_launcher"
+		android:paddingLeft="5dp"
+		android:paddingRight="5dp"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"/>
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:orientation="horizontal"
+		android:gravity="center_vertical">
+		<TextView
+			android:id="@+id/language"
+			android:textSize="20dp"
+			android:textColor="#000000"
+			android:textStyle="bold"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@mipmap/ic_launcher"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp"
-			android:paddingTop="5dp"
-			android:paddingBottom="5dp"/>
-		<LinearLayout 
-		    android:layout_width="wrap_content"
-			android:layout_height="fill_parent"
-			android:orientation="horizontal"
-			android:gravity="center_vertical">
-				<TextView
-					android:id="@+id/language"
-					android:textSize="20dp"
-					android:textColor="#000000"
-					android:textStyle="bold"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:gravity="center_vertical"/>
-				
-		</LinearLayout>
+			android:gravity="center_vertical"/>
+
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/style_header_alarm.xml b/safeDispatch/src/main/res/layout/style_header_alarm.xml
index c780ca1..d3f34dc 100644
--- a/safeDispatch/src/main/res/layout/style_header_alarm.xml
+++ b/safeDispatch/src/main/res/layout/style_header_alarm.xml
@@ -10,14 +10,14 @@
 	    android:gravity="center_vertical" >
 	    
 	    <ImageButton
-    			    android:id="@+id/imageButtonAdd"
-    			    android:layout_width="1dp"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="0"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+			android:id="@+id/imageButtonAdd"
+			android:layout_width="1dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:visibility="invisible"
+			android:background="@drawable/addmessage_selector"/>
 	    <TextView
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"
diff --git a/safeDispatch/src/main/res/layout/style_header_units.xml b/safeDispatch/src/main/res/layout/style_header_units.xml
index a574e3e..9620ef3 100644
--- a/safeDispatch/src/main/res/layout/style_header_units.xml
+++ b/safeDispatch/src/main/res/layout/style_header_units.xml
@@ -8,7 +8,6 @@
 	    android:layout_height="fill_parent"
 	    style="?header"
 	    android:gravity="center_vertical" >
-	    
 	   
 	    <TextView
 	        android:layout_width="fill_parent"
@@ -21,13 +20,13 @@
 	        android:gravity="left|center_vertical"
 	        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-		 <ImageButton
-    			    android:id="@+id/imageCheckAll"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="0"
-    			    android:layout_marginRight="1dp"
-    			    android:paddingLeft="2dp"
-    			    android:background="@drawable/uncheck_all"/>
+		<ImageButton
+			android:id="@+id/imageCheckAll"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:layout_marginRight="1dp"
+			android:paddingLeft="2dp"
+			android:background="@drawable/uncheck_all"/>
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/tabalarm.xml b/safeDispatch/src/main/res/layout/tabalarm.xml
index d67e7a0..bc380a2 100644
--- a/safeDispatch/src/main/res/layout/tabalarm.xml
+++ b/safeDispatch/src/main/res/layout/tabalarm.xml
@@ -4,86 +4,85 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
     style="?bg">
-    <LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:gravity="left"
-	        android:layout_weight="0"
-	        android:orientation="horizontal"
-	        style="?header"
-	        android:id="@+id/layoutHeader">
+    <LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:gravity="left"
+		android:layout_weight="0"
+		android:orientation="horizontal"
+		style="?header"
+		android:id="@+id/layoutHeader">
 
-    		    <ImageView
-			        android:id="@+id/imageViewMsg"
-			        android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
-			        android:src="@drawable/alert"
-			        android:paddingLeft="0dp"
-			        android:layout_margin="3dp"
-			        android:layout_weight="0" />
-    			<TextView
-    			    android:id="@+id/textView1"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
-    			    android:text="@string/alarms"
-    			    android:layout_marginLeft="5dp"
-    			    android:textStyle="bold"
-    			    android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
-    			    android:layout_weight="0"/>
+		<ImageView
+			android:id="@+id/imageViewMsg"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:src="@drawable/alert"
+			android:paddingLeft="0dp"
+			android:layout_margin="3dp"
+			android:layout_weight="0" />
+		<TextView
+			android:id="@+id/textView1"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="center_vertical"
+			android:text="@string/alarms"
+			android:layout_marginLeft="5dp"
+			android:textStyle="bold"
+			android:paddingTop="7dp"
+			android:textColor="#FFFFFF"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_weight="0"/>
 
-    			 <ImageView
-			        android:id="@+id/imageViewSeparator"
-			        android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
-			        android:layout_gravity="center_vertical"
-			        android:src="@drawable/separator_white"
-			        android:layout_margin="2dp"
-			        android:layout_weight="0"
-			        android:visibility="invisible"
-			        android:focusable="false" />
+		<ImageView
+			android:id="@+id/imageViewSeparator"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:src="@drawable/separator_white"
+			android:layout_margin="2dp"
+			android:layout_weight="0"
+			android:visibility="invisible"
+			android:focusable="false" />
 
-				<ImageView
-				    android:id="@+id/imageViewDown"
-				    android:layout_width="20dp"
-				    android:layout_height="fill_parent"
-				    android:layout_gravity="center_vertical"
-				    android:layout_marginBottom="2dp"
-				    android:layout_marginTop="2dp"
-				    android:focusable="false"
-				    android:visibility="invisible"
-				    android:src="@drawable/arrow_menu_down" />
+		<ImageView
+			android:id="@+id/imageViewDown"
+			android:layout_width="20dp"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_marginBottom="2dp"
+			android:layout_marginTop="2dp"
+			android:focusable="false"
+			android:visibility="invisible"
+			android:src="@drawable/arrow_menu_down" />
     			
-				<ImageButton
-    			    android:id="@+id/imageButtonAdd2"
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="1"
-    			    android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+		<ImageButton
+			android:id="@+id/imageButtonAdd2"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:scaleType="centerInside"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:visibility="invisible"
+			android:background="@drawable/addmessage_selector"/>
 
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-	        </LinearLayout>	
+	</LinearLayout>
     <LinearLayout 
-        	android:layout_width="fill_parent"
-        	android:layout_height="wrap_content"
-        	android:layout_weight="1">
-		    <GridView
-		        android:id="@+id/gridViewAlarms"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:background="#999999"
-		        android:drawSelectorOnTop="false"
-		        android:horizontalSpacing="0dp"
-		        android:listSelector="@drawable/gridalarm_selector"
-		        android:numColumns="1"
-		        android:verticalSpacing="1dp"
-		        android:padding="5dp"/>
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1">
+		<GridView
+			android:id="@+id/gridViewAlarms"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:background="#999999"
+			android:drawSelectorOnTop="false"
+			android:horizontalSpacing="0dp"
+			android:listSelector="@drawable/gridalarm_selector"
+			android:numColumns="1"
+			android:verticalSpacing="1dp"
+			android:padding="5dp"/>
 
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/tabradio.xml b/safeDispatch/src/main/res/layout/tabradio.xml
index 6f0fc57..ddb84b4 100644
--- a/safeDispatch/src/main/res/layout/tabradio.xml
+++ b/safeDispatch/src/main/res/layout/tabradio.xml
@@ -7,356 +7,354 @@
     style="?bg">
 	    
     <LinearLayout 
-        	android:id="@+id/layoutGateway"
-        	    android:layout_height="wrap_content"
-	    	    android:layout_width="fill_parent"
-	    	    android:weightSum="100"
-	    	    android:orientation="horizontal"
-	    	    style="?header">
+		android:id="@+id/layoutGateway"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:weightSum="100"
+		android:orientation="horizontal"
+		style="?header">
 
-			    	    <LinearLayout
-			    	        android:layout_width="wrap_content"
-			    	        android:layout_height="wrap_content"
-			    	        android:orientation="horizontal" >
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal" >
 
-			    	         <ImageView
-							        android:id="@+id/imageViewRadioStation"
-							        android:layout_width="wrap_content"
-							        android:layout_height="fill_parent"
-							        android:src="@drawable/enable"
-							        android:layout_weight="0" />
+			<ImageView
+				android:id="@+id/imageViewRadioStation"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/enable"
+				android:layout_weight="0" />
 			    	         		
-						  			<TextView
-						  			    android:layout_width="wrap_content"
-						  			    android:layout_height="fill_parent"
-						  			    android:gravity="center_vertical"
-						  			    android:id="@+id/textViewGateway"
-						  			    android:text="n/a"
-						  			    android:layout_marginLeft="5dp"
-						  			    android:textStyle="bold"
-						  			    android:paddingTop="7dp"
-						  			    android:textColor="#FFFFFF"
-						  			    android:textAppearance="?android:attr/textAppearanceMedium" 
-						  			    android:layout_weight="1"/>
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:gravity="center_vertical"
+				android:id="@+id/textViewGateway"
+				android:text="n/a"
+				android:layout_marginLeft="5dp"
+				android:textStyle="bold"
+				android:paddingTop="7dp"
+				android:textColor="#FFFFFF"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:layout_weight="1"/>
 
 									
-						  			<TextView
-						  			    android:layout_width="wrap_content"
-						  			    android:layout_height="fill_parent"
-						  			    android:gravity="center_vertical"
-						  			    android:id="@+id/textViewIP"
-						  			    android:text="[192.168.2.100]"
-						  			    android:paddingLeft="4dp"
-						  			    android:paddingTop="17dp"
-						  			    android:textColor="#FFFFFF"
-						  			    android:visibility="gone"
-						  			    android:textAppearance="?android:attr/textAppearanceMedium" 
-						  			    android:layout_weight="1"/>
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:gravity="center_vertical"
+				android:id="@+id/textViewIP"
+				android:text="[192.168.2.100]"
+				android:paddingLeft="4dp"
+				android:paddingTop="17dp"
+				android:textColor="#FFFFFF"
+				android:visibility="gone"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:layout_weight="1"/>
 						  			
-						  			<ImageView
-								        android:id="@+id/imageViewSeparator"
-								        android:layout_width="wrap_content"
-								        android:layout_height="fill_parent"
-								        android:layout_gravity="center_vertical"
-								        android:src="@drawable/separator_white"
-								        android:layout_margin="2dp"
-								        android:layout_weight="0"
-								        android:visibility="invisible"
-								        android:focusable="false" />
+			<ImageView
+				android:id="@+id/imageViewSeparator"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:src="@drawable/separator_white"
+				android:layout_margin="2dp"
+				android:layout_weight="0"
+				android:visibility="invisible"
+				android:focusable="false" />
 					
-									<ImageView
-									    android:id="@+id/imageViewDown"
-									    android:layout_width="20dp"
-									    android:layout_height="fill_parent"
-									    android:layout_gravity="center_vertical"
-									    android:layout_marginBottom="2dp"
-									    android:layout_marginTop="2dp"
-									    android:focusable="false"
-									    android:visibility="visible"
-									    android:src="@drawable/arrow_menu_down" />
+			<ImageView
+				android:id="@+id/imageViewDown"
+				android:layout_width="20dp"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:layout_marginBottom="2dp"
+				android:layout_marginTop="2dp"
+				android:focusable="false"
+				android:visibility="visible"
+				android:src="@drawable/arrow_menu_down" />
 									
-									<ImageView
-						  			     android:id="@+id/imageViewStatus"
-						  			     android:layout_width="wrap_content"
-						  			     android:layout_height="fill_parent"
-						  			     android:gravity="center_vertical"
-						  			     android:scaleType="fitCenter"
-						  			     android:src="@drawable/status_offline" />
+			<ImageView
+				 android:id="@+id/imageViewStatus"
+				 android:layout_width="wrap_content"
+				 android:layout_height="fill_parent"
+				 android:gravity="center_vertical"
+				 android:scaleType="fitCenter"
+				 android:src="@drawable/status_offline" />
 									
-			    	    </LinearLayout>
+		</LinearLayout>
 
-        	    		<LinearLayout
-        	    		    android:layout_width="fill_parent"
-        	    		    android:layout_height="wrap_content"
-        	    		    android:orientation="horizontal"
-        	    		    android:gravity="right"
-        	    		    android:layout_marginRight="8dp"
-							android:visibility="gone">
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="right"
+			android:layout_marginRight="8dp"
+			android:visibility="gone">
 				
 				  			
-				  			<ImageButton
-				  			    android:id="@+id/imageButtonAdd"
-				  			    android:layout_width="1dp"
-				  			    android:layout_height="wrap_content"
-				  			    android:layout_weight="0"
-				  			    android:layout_marginRight="2dp"
-				  			    android:paddingLeft="2dp"
-				  			    android:background="@drawable/addmessage_selector"
-				  			    android:visibility="invisible"/>
-				  			 <ImageView
-					    		    android:id="@+id/imageViewGreen"
-					    		    android:layout_width="wrap_content"
-					    		    android:layout_height="wrap_content"
-					    		    android:scaleType="fitCenter"
-					    		    android:paddingTop="4dp"
-					    		    android:src="@drawable/call_private_green_small"
-					    		    android:layout_gravity="center_vertical" />
+			<ImageButton
+				android:id="@+id/imageButtonAdd"
+				android:layout_width="1dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="0"
+				android:layout_marginRight="2dp"
+				android:paddingLeft="2dp"
+				android:background="@drawable/addmessage_selector"
+				android:visibility="invisible"/>
+			<ImageView
+				android:id="@+id/imageViewGreen"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:scaleType="fitCenter"
+				android:paddingTop="4dp"
+				android:src="@drawable/call_private_green_small"
+				android:layout_gravity="center_vertical" />
 				  			 
-				  			 <TextView
-				        	        android:id="@+id/textViewLoggedIn"
-				        	        android:layout_width="wrap_content"
-				        	        android:layout_height="fill_parent"
-				        	        android:gravity="center_vertical"
-				        	        android:layout_gravity="center_vertical"
-				        	        android:text="@string/login"
-				        	        android:textColor="#FFFFFF"
-				        	        android:textSize="16dp"
-					  			    android:paddingTop="7dp" />
-				  			  </LinearLayout>
-				       	<!--  android:background="@drawable/addmessage_selector"  -->
-        	</LinearLayout>
-    
-    	<LinearLayout 
-    	    	android:layout_width="fill_parent"
-    	    	android:layout_height="wrap_content"
-    	    	android:background="@drawable/style_bluebutton"
-    	    	android:paddingLeft="5dp"
-    	    	android:paddingTop="2dp"
-    	    	android:paddingBottom="2dp"
-    	    	android:visibility="gone"
-    	    	android:orientation="horizontal">
-			<LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_weight="1"
-			    android:layout_gravity="center_vertical"
-			    android:orientation="horizontal">
-	    		<TextView
-	    		    android:id="@+id/textView1"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/IP"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-	    	    <TextView
-	    		    android:id="@+id/textViewIP2"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/emptyIP"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-    	    </LinearLayout>
-    	    <LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_weight="1"
-			    android:id="@+id/layoutGateway2">
-	    		<ImageView
-	    		    android:id="@+id/imageView1"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:src="@drawable/enable" />
-
-	    		<LinearLayout 
-			        android:layout_width="wrap_content"
-			        android:layout_height="wrap_content">
-			    	    <TextView
-			    		    android:id="@+id/textViewGateway2"
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text=""
-			    		    android:textColor="#FFFFFF"
-			    		    android:textSize="17dp"
-			    		    android:paddingRight="2dp"/>
-			    	    <ImageView
-			    		    android:id="@+id/imageViewGateway"
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="fill_parent"
-			    		    android:src="@drawable/arrow_down" />
-			   	</LinearLayout>
-    	    </LinearLayout>
-    	    <LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="fill_parent"
-			    android:layout_gravity="center_vertical"
-			    android:layout_weight="6">
-	    	    <TextView
-	    		    android:id="@+id/textView3"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/Status"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-	    	    <ImageView
-	    		    android:id="@+id/imageViewStatus2"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:src="@drawable/status_offline"
-	    		     />
-    	    </LinearLayout>			
-    	</LinearLayout>
-
-		<LinearLayout 
-    	    android:layout_width="fill_parent"
-    	    android:layout_height="wrap_content"
-    	    android:orientation="vertical"
-    	    android:paddingTop="2dp">
+			<TextView
+				android:id="@+id/textViewLoggedIn"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:gravity="center_vertical"
+				android:layout_gravity="center_vertical"
+				android:text="@string/login"
+				android:textColor="#FFFFFF"
+				android:textSize="16dp"
+				android:paddingTop="7dp" />
 		</LinearLayout>
+	</LinearLayout>
+    
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/style_bluebutton"
+		android:paddingLeft="5dp"
+		android:paddingTop="2dp"
+		android:paddingBottom="2dp"
+		android:visibility="gone"
+		android:orientation="horizontal">
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_gravity="center_vertical"
+			android:orientation="horizontal">
+			<TextView
+				android:id="@+id/textView1"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/IP"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+			<TextView
+				android:id="@+id/textViewIP2"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/emptyIP"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:id="@+id/layoutGateway2">
+			<ImageView
+				android:id="@+id/imageView1"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/enable" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+				<TextView
+					android:id="@+id/textViewGateway2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text=""
+					android:textColor="#FFFFFF"
+					android:textSize="17dp"
+					android:paddingRight="2dp"/>
+				<ImageView
+					android:id="@+id/imageViewGateway"
+					android:layout_width="wrap_content"
+					android:layout_height="fill_parent"
+					android:src="@drawable/arrow_down" />
+			</LinearLayout>
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="6">
+			<TextView
+				android:id="@+id/textView3"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/Status"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+			<ImageView
+				android:id="@+id/imageViewStatus2"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/status_offline" />
+		</LinearLayout>
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingTop="2dp">
+	</LinearLayout>
 		
-		<LinearLayout 
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:orientation="vertical"
-		    android:layout_gravity="center"
-		    android:gravity="center">
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical"
+		android:layout_gravity="center"
+		android:gravity="center">
 
 		<LinearLayout 
-    			    android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
-    	    		android:orientation="horizontal"
-    	    		android:paddingRight="10dp"
-    	    		android:layout_gravity="center_vertical">
-    	    		<LinearLayout 
-    	    		    android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
-    	    		    android:gravity="center">
-			    		<TextView
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text="@string/Zone"
-			    		    android:textStyle="bold"
-			    		    android:textColor="#ffffffff"
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
-			    		<LinearLayout
-						    android:id="@+id/layoutSpinnerZone"
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
-						    android:gravity="right"
-						    android:minWidth="150dp"
-						    android:orientation="horizontal"
-						    android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:paddingRight="10dp"
+			android:layout_gravity="center_vertical">
+			<LinearLayout
+				android:layout_weight="1"
+				android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:gravity="center">
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/Zone"
+					android:textStyle="bold"
+					android:textColor="#ffffffff"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
+				<LinearLayout
+					android:id="@+id/layoutSpinnerZone"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
+					android:gravity="right"
+					android:minWidth="150dp"
+					android:orientation="horizontal"
+					android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
+					android:paddingRight="3dp"
+					android:paddingTop="4dp" >
 
-						    <TextView
-						        android:id="@+id/textViewZone"
-				    		    android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
-				    		    android:text=""
-				    		    android:textColor="#000000"
-				    		    android:textStyle="bold"
-				    		    android:textSize="20dp"/>
-						    <ImageView 
-						        android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
-						</LinearLayout>
-			    	</LinearLayout>
-    	    		<LinearLayout 
-    	    		    android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
-    	    		    android:gravity="center">
-			    		<TextView
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text="@string/Channel"
-			    		    android:textColor="#ffffffff"
-			    		    android:textStyle="bold"
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
+					<TextView
+						android:id="@+id/textViewZone"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:text=""
+						android:textColor="#000000"
+						android:textStyle="bold"
+						android:textSize="20dp"/>
+					<ImageView
+						android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical" />
+				</LinearLayout>
+			</LinearLayout>
+			<LinearLayout
+				android:layout_weight="1"
+				android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:gravity="center">
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/Channel"
+					android:textColor="#ffffffff"
+					android:textStyle="bold"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-						<LinearLayout
-						    android:id="@+id/layoutSpinnerChannel"
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
-						    android:gravity="right"
-						    android:minWidth="150dp"
-						    android:orientation="horizontal"
-						    android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
+				<LinearLayout
+					android:id="@+id/layoutSpinnerChannel"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
+					android:gravity="right"
+					android:minWidth="150dp"
+					android:orientation="horizontal"
+					android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
+					android:paddingRight="3dp"
+					android:paddingTop="4dp" >
 
-						    <TextView
-						        android:id="@+id/textViewChannel"
-				    		    android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
-				    		    android:text=""
-				    		    android:textColor="#000000"
-				    		    android:textStyle="bold"
-				    		    android:textSize="20dp"/>
-						    <ImageView 
-						        android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
-						</LinearLayout>
-					</LinearLayout>
-    			</LinearLayout>
+					<TextView
+						android:id="@+id/textViewChannel"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:text=""
+						android:textColor="#000000"
+						android:textStyle="bold"
+						android:textSize="20dp"/>
+					<ImageView
+						android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical" />
+				</LinearLayout>
+			</LinearLayout>
+		</LinearLayout>
 
 		<LinearLayout 
-			    	android:layout_width="fill_parent"
-			    	android:layout_height="wrap_content"
-			    	android:orientation="horizontal"
-			    	android:gravity="center"
-			    	android:layout_gravity="center_horizontal">
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="center"
+			android:layout_gravity="center_horizontal">
     	    		
-					<LinearLayout 
-	    	    	    android:layout_weight="1"
-	    	    	    android:layout_width="fill_parent"
-	    	    	    android:layout_height="fill_parent"
-	    	    	    android:gravity="center"
-	    	    	    android:paddingTop="3dp">
-				    	    	<LinearLayout
-				    	    	    android:layout_width="276dp"
-				    	    	    android:layout_height="93dp"
-				    	    	    android:layout_gravity="center"
-				    	    	    android:background="@drawable/screen"
-				    	    	    android:gravity="center"
-				    	    	    android:orientation="vertical"
-				    	    	    android:paddingBottom="0dp"
-				    	    	    android:paddingTop="7dp">
+			<LinearLayout
+				android:layout_weight="1"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:gravity="center"
+				android:paddingTop="3dp">
+				<LinearLayout
+					android:layout_width="276dp"
+					android:layout_height="93dp"
+					android:layout_gravity="center"
+					android:background="@drawable/screen"
+					android:gravity="center"
+					android:orientation="vertical"
+					android:paddingBottom="0dp"
+					android:paddingTop="7dp">
 				
-							    		<TextView
-							    		    android:id="@+id/textViewMessageChannel"
-							    		    android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
-							    		    android:paddingBottom="7dp"
-							    		    android:textColor="#000000"
-							    		    android:textSize="20dp"
-							    		    android:textStyle="bold"/>
-							    		<TextView
-							    		    android:id="@+id/textViewMessageStatus"
-							    		    android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
-							    		    android:textColor="#000000"
-							    		    android:textSize="20dp"
-							    		    android:textStyle="bold"/>
-							    </LinearLayout>
-				    </LinearLayout>
-			    </LinearLayout>
+					<TextView
+						android:id="@+id/textViewMessageChannel"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal"
+						android:paddingBottom="7dp"
+						android:textColor="#000000"
+						android:textSize="20dp"
+						android:textStyle="bold"/>
+					<TextView
+						android:id="@+id/textViewMessageStatus"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal"
+						android:textColor="#000000"
+						android:textSize="20dp"
+						android:textStyle="bold"/>
+				</LinearLayout>
+			</LinearLayout>
+		</LinearLayout>
 		
 		<LinearLayout 
     	    android:layout_width="fill_parent"
@@ -366,104 +364,104 @@
     	    android:layout_gravity="center_horizontal"
     	    android:gravity="center_horizontal">
 
-    			<LinearLayout 
-    			    android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
-    	    		android:orientation="vertical"
-    	    		android:gravity="center_horizontal"
-    	    		android:layout_weight="1">
-				    	<LinearLayout 
-				    	    	android:layout_width="wrap_content"
-				    	    	android:layout_height="wrap_content"
-				    	    	android:orientation="vertical">
-		    			    	<RadioGroup android:id="@+id/radioGroupCallType" 
-		    			    	    	android:layout_width="wrap_content" 
-		    			    	    	android:layout_height="wrap_content"
-		    			    	    	android:layout_marginBottom="3sp">
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:gravity="center_horizontal"
+				android:layout_weight="1">
+				<LinearLayout
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+					<RadioGroup
+						android:id="@+id/radioGroupCallType"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="3sp">
 		
-					    			<RadioButton
-					    			    android:id="@+id/radioAll"
-					    			    android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
-					    			    android:checked="true"
-					    			    android:text="@string/AllCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+						<RadioButton
+							android:id="@+id/radioAll"
+							android:layout_width="wrap_content"
+							android:layout_height="30dp"
+							android:checked="true"
+							android:text="@string/AllCall"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textColor="#ffffffff" />
 		
-					    			<RadioButton
-					    			    android:id="@+id/radioGroup"
-					    			    android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
-					    			    android:text="@string/GroupCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+						<RadioButton
+							android:id="@+id/radioGroup"
+							android:layout_width="wrap_content"
+							android:layout_height="30dp"
+							android:text="@string/GroupCall"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textColor="#ffffffff" />
 		
-					    			<RadioButton
-					    			    android:id="@+id/radioPrivate"
-					    			    android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
-					    			    android:text="@string/PrivateCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+						<RadioButton
+							android:id="@+id/radioPrivate"
+							android:layout_width="wrap_content"
+							android:layout_height="30dp"
+							android:text="@string/PrivateCall"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textColor="#ffffffff" />
 		
-					    		</RadioGroup>
-					    		 <LinearLayout
-									    android:id="@+id/layoutSpinnerCallType"
-									    android:layout_width="wrap_content"
-									    android:layout_height="wrap_content"
-									    android:background="@drawable/style_spinner"
-									    android:gravity="right"
-									    android:minWidth="150dp"
-									    android:orientation="horizontal"
-									    android:paddingBottom="4dp"
-									    android:paddingLeft="3dp"
-									    android:paddingRight="3dp"
-									    android:paddingTop="4dp"
-									    android:visibility="invisible" >
+					</RadioGroup>
+					<LinearLayout
+						android:id="@+id/layoutSpinnerCallType"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:background="@drawable/style_spinner"
+						android:gravity="right"
+						android:minWidth="150dp"
+						android:orientation="horizontal"
+						android:paddingBottom="4dp"
+						android:paddingLeft="3dp"
+						android:paddingRight="3dp"
+						android:paddingTop="4dp"
+						android:visibility="invisible" >
 			
-									    <TextView
-									        android:id="@+id/textViewCallType"
-							    		    android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_vertical"
-							    		    android:text=""
-							    		    android:textColor="#000000"
-							    		    android:textStyle="bold"
-							    		    android:textSize="20dp"/>
-									    <ImageView 
-									        android:src="@drawable/arrow_spinner"
-									        android:layout_width="wrap_content"
-									        android:layout_height="wrap_content"
-									        android:layout_gravity="center_vertical" />
-								</LinearLayout>
-			    		 </LinearLayout>
-    			</LinearLayout>
-
-    			<LinearLayout
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="1"
-    			    android:gravity="center_vertical|center_horizontal"
-    			    android:orientation="vertical" >
-				    	<Button
-	    			        android:id="@+id/buttonPTT"
-	    			        style="@style/ButtonPTT"
-	    			        android:layout_width="135dp"
-	    			        android:layout_height="88dp"
-	    			        android:background="@drawable/style_buttonptt"
-	    			        android:gravity="center"
-	    			        android:paddingBottom="20dp"
-	    			        android:text="@string/PTT" />
-	    			    <Button
-	    			        android:id="@+id/buttonDKey"
-	    			        style="@style/ButtonText"
-	    			        android:layout_width="135dp"
-	    			        android:layout_height="wrap_content"
-	    			        android:background="@drawable/style_bluebutton"
-	    			        android:text="@string/DeKey"
-	    			        android:textSize="18dp" />
-    			</LinearLayout>
+						<TextView
+							android:id="@+id/textViewCallType"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center_vertical"
+							android:text=""
+							android:textColor="#000000"
+							android:textStyle="bold"
+							android:textSize="20dp"/>
+						<ImageView
+							android:src="@drawable/arrow_spinner"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center_vertical" />
+					</LinearLayout>
+				 </LinearLayout>
+			</LinearLayout>
 
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:gravity="center_vertical|center_horizontal"
+				android:orientation="vertical" >
+				<Button
+					android:id="@+id/buttonPTT"
+					style="@style/ButtonPTT"
+					android:layout_width="135dp"
+					android:layout_height="88dp"
+					android:background="@drawable/style_buttonptt"
+					android:gravity="center"
+					android:paddingBottom="20dp"
+					android:text="@string/PTT" />
+				<Button
+					android:id="@+id/buttonDKey"
+					style="@style/ButtonText"
+					android:layout_width="135dp"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_bluebutton"
+					android:text="@string/DeKey"
+					android:textSize="18dp" />
+			</LinearLayout>
     	</LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/layout/tabrecordings.xml b/safeDispatch/src/main/res/layout/tabrecordings.xml
index a47ca0a..3a52110 100644
--- a/safeDispatch/src/main/res/layout/tabrecordings.xml
+++ b/safeDispatch/src/main/res/layout/tabrecordings.xml
@@ -123,19 +123,18 @@
     			    android:visibility="gone"
     			    android:background="@drawable/recycle"/>
     			
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-   </LinearLayout>
-		    
-			<GridView 
-			    	android:id="@+id/gridViewRecordings" 
-			    	android:layout_width="fill_parent" 
-			    	android:layout_height="fill_parent"
-			    	android:verticalSpacing="1dp"
-			    	android:horizontalSpacing="0dp"
-			    	android:background="#999999"
-			    	android:drawSelectorOnTop="false"
-			    	android:listSelector="@drawable/gridalarm_selector"
-			    	android:numColumns="1"
-			    	android:padding="5dp"></GridView>
 		</LinearLayout>
+		    
+		<GridView
+				android:id="@+id/gridViewRecordings"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:verticalSpacing="1dp"
+				android:horizontalSpacing="0dp"
+				android:background="#999999"
+				android:drawSelectorOnTop="false"
+				android:listSelector="@drawable/gridalarm_selector"
+				android:numColumns="1"
+				android:padding="5dp"></GridView>
+	</LinearLayout>
 </LinearLayout>
diff --git a/safeDispatch/src/main/res/layout/tabsetup.xml b/safeDispatch/src/main/res/layout/tabsetup.xml
index 0e0ec86..1887a27 100644
--- a/safeDispatch/src/main/res/layout/tabsetup.xml
+++ b/safeDispatch/src/main/res/layout/tabsetup.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layoutMain"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -10,246 +11,237 @@
 	    android:layout_height="fill_parent"
 	    android:layout_width="fill_parent"
 	    android:layout_weight="80">
-		    <LinearLayout
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:orientation="vertical"
-		        android:layout_gravity="center"
-		        android:paddingLeft="5dp"
-		        android:paddingBottom="50dp" >
-				<LinearLayout 
-				    android:layout_width="fill_parent"
-				    android:layout_height="wrap_content"
-				    android:orientation="horizontal">
-				 <LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:gravity="left"
-			           	 android:paddingTop="10dp"
-			           	 android:paddingLeft="7dp"
-			           	 android:layout_weight="0.4">
-			            <TextView
-			                android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
-			                android:text="@string/serverIP"
-			                android:textSize="14dp"
-			                android:textColor="#FFFFFF"
-			                android:textStyle="bold"
-			                android:layout_gravity="center_vertical"
-			                android:gravity="center_vertical|right"
-			                android:layout_weight="2"/>
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:layout_gravity="center"
+			android:paddingLeft="5dp"
+			android:paddingBottom="50dp" >
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+				<LinearLayout
+					 android:layout_width="fill_parent"
+					 android:layout_height="wrap_content"
+					 android:orientation="horizontal"
+					 android:gravity="left"
+					 android:paddingTop="10dp"
+					 android:paddingLeft="7dp"
+					 android:layout_weight="0.4">
+					<TextView
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/serverIP"
+						android:textSize="14dp"
+						android:textStyle="bold"
+						android:layout_gravity="center_vertical"
+						android:gravity="center_vertical|right"
+						android:layout_weight="2"/>
 		
-			            <LinearLayout
-			                android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
-			                android:layout_weight="1" 
-			                android:paddingTop="3dp">
-			                <EditText
-			                    android:id="@+id/appServerIP"
-			                    android:layout_width="wrap_content"
-			                    android:layout_height="wrap_content"
-			                    android:gravity="center"
-			                    android:minWidth="200dp"
-			                    android:singleLine="true"
-			                    android:imeOptions="actionDone" >
-			                </EditText>
-			            </LinearLayout>
+					<LinearLayout
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:paddingTop="3dp">
+						<EditText
+							android:id="@+id/appServerIP"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:gravity="center"
+							android:minWidth="200dp"
+							android:singleLine="true"
+							android:imeOptions="actionDone" >
+						</EditText>
+					</LinearLayout>
 		
 				</LinearLayout>
-				 <LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:gravity="left"
-			           	 android:paddingTop="10dp"
-			           	 android:layout_weight="0.6">
-			            <TextView
-			                android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
-			                android:text="@string/serverPort"
-			                android:textSize="14dp"
-			                android:textColor="#FFFFFF"
-			                android:textStyle="bold"
-			                android:gravity="center_vertical|right"
-			                android:layout_gravity="center_vertical|right"
-			                android:layout_weight="1.4"/>
-			            <LinearLayout 
-			                	android:layout_width="fill_parent"
-			                	android:layout_height="wrap_content"
-			                	android:layout_weight="1"
-			                	android:paddingTop="3dp">
-					            <EditText 
-					           			android:layout_height="wrap_content" 
-					           			android:id="@+id/appServerPort" 
-					           			android:maxLength="5"
-					           			android:minWidth="73dp"
-					           			android:gravity="center"
-					           			android:layout_width="wrap_content"
-					           			android:layout_gravity="center_vertical|right"
-					           			android:inputType="number"
-					           			android:imeOptions="actionDone">
-								</EditText>
-						</LinearLayout>
+			 	<LinearLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal"
+					android:gravity="left"
+					android:paddingTop="10dp"
+					android:layout_weight="0.6">
+					<TextView
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/serverPort"
+						android:textSize="14dp"
+						android:textStyle="bold"
+						android:gravity="center_vertical|right"
+						android:layout_gravity="center_vertical|right"
+						android:layout_weight="1.4"/>
+					<LinearLayout
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:paddingTop="3dp">
+						<EditText
+							android:layout_height="wrap_content"
+							android:id="@+id/appServerPort"
+							android:maxLength="5"
+							android:minWidth="73dp"
+							android:gravity="center"
+							android:layout_width="wrap_content"
+							android:layout_gravity="center_vertical|right"
+							android:inputType="number"
+							android:imeOptions="actionDone" />
+					</LinearLayout>
 				</LinearLayout>
 			</LinearLayout>
-			
-			
+
 			<LinearLayout 
 			    android:layout_width="fill_parent"
 			    android:layout_height="wrap_content"
 			    android:orientation="horizontal"
 			    android:id="@+id/layoutPath">
 			    <LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:paddingTop="0dp"
-			           	 android:gravity="center_vertical|left">
-					    <LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="95dp"
-			                	android:layout_weight="0">
-				            <TextView
-				                android:layout_width="fill_parent"
-				                android:layout_height="wrap_content"
-				                android:text="@string/configName"
-				                android:textSize="14dp"
-				                android:textColor="#FFFFFF"
-				                android:textStyle="bold"
-				                android:gravity="center_vertical|right"
-				                android:layout_gravity="center_vertical"/>
-			            </LinearLayout>
-			            <LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="0dp"
-			                	android:layout_weight="1"
-			                	android:paddingTop="3dp">
+					 android:layout_width="fill_parent"
+					 android:layout_height="wrap_content"
+					 android:orientation="horizontal"
+					 android:paddingTop="0dp"
+					 android:gravity="center_vertical|left">
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="95dp"
+						android:layout_weight="0">
+						<TextView
+							android:layout_width="fill_parent"
+							android:layout_height="wrap_content"
+							android:text="@string/configName"
+							android:textSize="14dp"
+							android:textStyle="bold"
+							android:gravity="center_vertical|right"
+							android:layout_gravity="center_vertical"/>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="0dp"
+						android:layout_weight="1"
+						android:paddingTop="3dp">
 		
-			                <EditText
-			                    android:id="@+id/editTextPath"
-			                    android:layout_width="fill_parent"
-			                    android:layout_height="wrap_content"
-			                    android:gravity="right|center_vertical"
-			                    android:text="serial"
-			                    android:imeOptions="actionDone"
-			                    android:minWidth="73dp"
-			                    
-			                    android:singleLine="true" >
-			                    <requestFocus />
-			                </EditText>
+						<EditText
+							android:id="@+id/editTextPath"
+							android:layout_width="fill_parent"
+							android:layout_height="wrap_content"
+							android:gravity="right|center_vertical"
+							android:text="serial"
+							android:imeOptions="actionDone"
+							android:minWidth="73dp"
+
+							android:singleLine="true" >
+							<requestFocus />
+						</EditText>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:layout_weight="0"
+						android:paddingTop="3dp">
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:id="@+id/btn_browse"
+							android:text="@string/load"
+							style="@style/ButtonText"
+							android:textColor="#000"
+							android:textSize="18dp"/>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:layout_weight="0"
+						android:paddingTop="3dp"
+						android:paddingRight="3dp">
 		
-						</LinearLayout>
-			            <LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="wrap_content"
-			                	android:layout_weight="0"
-			                	android:paddingTop="3dp">
-					            <Button
-									android:layout_width="wrap_content"
-									android:layout_height="wrap_content"
-									android:id="@+id/btn_browse"
-									android:text="@string/load"
-									style="@style/ButtonText"
-									android:textColor="#000"
-									android:textSize="18dp"/>
-						</LinearLayout>
-						<LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="wrap_content"
-			                	android:layout_weight="0"
-			                	android:paddingTop="3dp"
-			                	android:paddingRight="3dp">
-		
-							<ImageView
-							    android:id="@+id/imageViewQuestionMark"
-							    android:layout_width="wrap_content"
-							    android:layout_height="wrap_content"
-							    android:src="@drawable/questionmark_small" />
-						</LinearLayout>
+						<ImageView
+							android:id="@+id/imageViewQuestionMark"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:src="@drawable/questionmark_small" />
+					</LinearLayout>
 				</LinearLayout>
-			    
 			</LinearLayout>
 			
 			<LinearLayout
-			        android:id="@+id/frameLayout11"
-			        android:layout_width="fill_parent"
-			        android:layout_height="wrap_content"
-			        android:orientation="horizontal"
-			        android:gravity="left" >
+				android:id="@+id/frameLayout11"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:gravity="left" >
 			
-			        <TextView
-			            android:layout_width="95dp"
-			            android:layout_height="wrap_content"
-			            android:text="@string/language"
-			            android:textSize="14dp"
-						android:layout_marginRight="2dp"
-			            android:textColor="#FFFFFF"
-			            android:textStyle="bold"
-			            android:gravity="right"
-			            android:layout_gravity="center_vertical"/>
-					<LinearLayout
-						    android:id="@+id/layoutSpinnerLanguage"
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
-						    android:gravity="left|center_vertical"
-						    android:minWidth="223dp"
-						    android:orientation="horizontal"
-						    android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
-					    	 <ImageView 
-					    	    android:id="@+id/imageLanguage"
-						        android:src="@drawable/de"
-						        android:layout_width="wrap_content"
-						        android:layout_height="fill_parent"
-						        android:layout_gravity="center_vertical"
-						        android:layout_weight="0" />
-						    <TextView
-						        android:id="@+id/textViewSpinnerLanguage"
-				    		    android:layout_width="fill_parent"
-				    		    android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
-				    		    android:gravity="left"
-				    		    android:text="Germany"
-				    		    android:textColor="#000000"
-				    		    android:textSize="17dp"
-				    		    android:layout_weight="1"
-				    		    android:paddingBottom="2dp"
-				    		    android:paddingLeft="3dp">
-				    		    	<requestFocus />
-				    		    </TextView>
-						    <ImageView 
-						        android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical"
-						        android:layout_weight="0" />
-						</LinearLayout>
+				<TextView
+					android:layout_width="95dp"
+					android:layout_height="wrap_content"
+					android:text="@string/language"
+					android:textSize="14dp"
+					android:layout_marginRight="2dp"
+					android:textStyle="bold"
+					android:gravity="right"
+					android:layout_gravity="center_vertical"/>
+				<LinearLayout
+					android:id="@+id/layoutSpinnerLanguage"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
+					android:gravity="left|center_vertical"
+					android:minWidth="223dp"
+					android:orientation="horizontal"
+					android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
+					android:paddingRight="3dp"
+					android:paddingTop="4dp" >
+					<ImageView
+						android:id="@+id/imageLanguage"
+						android:src="@drawable/de"
+						android:layout_width="wrap_content"
+						android:layout_height="fill_parent"
+						android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
+					<TextView
+						android:id="@+id/textViewSpinnerLanguage"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:gravity="left"
+						android:text="Germany"
+						android:textColor="#000000"
+						android:textSize="17dp"
+						android:layout_weight="1"
+						android:paddingBottom="2dp"
+						android:paddingLeft="3dp">
+						<requestFocus />
+					</TextView>
+					<ImageView
+						android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
+				</LinearLayout>
 			</LinearLayout>
 			
-				<LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:gravity="center_horizontal"
-			           	 android:layout_marginTop="20dp">
-			            <Button
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:id="@+id/btn_save"
-							android:text="@string/save"
-							style="@style/ButtonText"
-							android:textSize="22dp"
-		    			    android:background="@drawable/style_bluebutton"/>
-				</LinearLayout>
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:gravity="center_horizontal"
+				android:layout_marginTop="20dp">
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:id="@+id/btn_save"
+					android:text="@string/save"
+					style="@style/ButtonText"
+					android:textSize="22dp"
+					android:background="@drawable/style_bluebutton"/>
+			</LinearLayout>
 		</LinearLayout>
 	</LinearLayout>
-<RelativeLayout 
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
     
-</RelativeLayout> 
 </LinearLayout>
\ No newline at end of file