--- android/TrainInfo/res/layout/welcome.xml	2009/10/29 08:56:17	481
+++ android/TrainInfo/res/layout/welcome.xml	2011/05/04 20:25:15	1446
@@ -5,49 +5,65 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-	android:padding="5dp"    
+	android:padding="5dp"
     >
-    <ImageView
-    		android:layout_width="wrap_content"
-    		android:layout_height="wrap_content"
-    		android:src="@drawable/train"
-    		android:paddingBottom="2px"
-    		/>
+    <LinearLayout
+    	android:orientation="horizontal"
+    	android:layout_width="fill_parent"
+    	android:layout_height="wrap_content"
+		android:padding="5dp"    
+    	>
+	    <ImageView
+	    		android:layout_width="wrap_content"
+	    		android:layout_height="wrap_content"
+	    		android:src="@drawable/train"
+	    		android:paddingBottom="2px"
+	    		android:paddingRight="20px"
+	    		/>
+	    <TextView 
+	       		android:layout_width="wrap_content"
+	    		android:layout_height="wrap_content"
+	    		android:text="@string/app_name"
+				android:textSize="22sp"
+				android:textStyle="bold"
+				android:paddingTop="6px"
+	    		/> 
+    </LinearLayout>
     		   
     <Button android:id="@+id/nearest" 
     		android:layout_width="fill_parent"
     		android:layout_height="wrap_content"
-    		android:text="Find nearest stations" />
+    		android:text="@string/welcome_nearest" />
     
     <Button android:id="@+id/search"
     		android:layout_width="fill_parent"
     		android:layout_height="wrap_content"     
-    		android:text="Search stations" />
+    		android:text="@string/welcome_search" />
     
     <Button android:id="@+id/favorites"
     		android:layout_width="fill_parent"
     		android:layout_height="wrap_content"  
-    		android:text="Favorite stations" />
+    		android:text="@string/welcome_favorites" />
+
+    <View android:layout_width="fill_parent"
+    		android:layout_height="15dp" 
+    		/>
     		
-    <Button android:id="@+id/about"
+    <Button android:id="@+id/settings"
     		android:layout_width="fill_parent"
     		android:layout_height="wrap_content"  
-    		android:text="About" />
-    		
+    		android:text="@string/welcome_settings" />
+
+
     <View android:layout_width="fill_parent"
-    		android:layout_height="wrap_content" 
-    		android:layout_weight="1"
+    		android:layout_height="15dp" 
     		/>
-    		    		
 
-	<com.admob.android.ads.AdView   
-				android:layout_width="fill_parent" 
-				android:layout_height="wrap_content"
-				admobsdk:backgroundColor="#000000"
-				admobsdk:textColor="#FFFFFF"
-				admobsdk:keywords="Android application,train stations, denmark, s-tog, tog, denmark"
-				admobsdk:isGoneWithoutAd="false"
-				admobsdk:testing="true"
-                />
-   
+
+    		
+    <Button android:id="@+id/about"
+    		android:layout_width="fill_parent"
+    		android:layout_height="wrap_content"  
+    		android:text="@string/welcome_about" />
+
 </LinearLayout>
\ No newline at end of file