--- android/TrainInfo/res/layout/departurelist.xml	2010/01/26 21:17:26	552
+++ android/TrainInfo/res/layout/departurelist.xml	2010/07/11 14:58:13	982
@@ -11,13 +11,25 @@
     	android:layout_height="wrap_content"
     	android:id="@+id/header"
     	android:clickable="true"
-    	>    
-	    <TextView android:id="@+id/stationName"
-	    		android:layout_width="wrap_content"
-	    		android:layout_height="wrap_content"
-	    		android:textSize="20sp"
-	    		android:textStyle="bold"
-	    		/>
+    	>
+    	<LinearLayout
+    	   	android:orientation="horizontal"
+    		android:layout_width="wrap_content"
+    		android:layout_height="wrap_content">    
+		    <TextView android:id="@+id/stationName"
+		    		android:layout_width="wrap_content"
+		    		android:layout_height="wrap_content"
+		    		android:textSize="20sp"
+		    		android:textStyle="bold"/>
+		    <ImageView android:id="@+id/notifIcon"
+		    		android:layout_width="wrap_content"
+		    		android:layout_height="wrap_content"
+		    		android:layout_gravity="center"
+		    		android:layout_marginLeft="2dp"
+		    		android:src="@drawable/info20"
+		    		android:visibility="invisible"
+		    		/>
+		</LinearLayout>	    		
 	    <TextView android:id="@+id/stationAddr"
 	    		android:layout_width="wrap_content"
 	    		android:layout_height="wrap_content"
@@ -41,12 +53,35 @@
                android:layout_width="fill_parent" 
                android:layout_height="wrap_content"
                android:clickable="false"
+               android:layout_weight="1"
                />
    <TextView android:id="@+id/metroonly"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:visibility="gone"
-		android:text="Sorry, but there's no departure info for the Copenhagen Metro"
+		android:text="@string/no_metro"
+		
 		/>
     		
+	<LinearLayout 
+    	android:orientation="horizontal"
+    	android:layout_width="fill_parent"
+    	android:layout_height="wrap_content"
+    	>
+    	<Button
+    		android:id="@+id/departurebtn"
+    		android:layout_width="0dp"
+    		android:layout_height="wrap_content"
+    		android:layout_weight="1"
+    		android:background="@drawable/custom_button_hilight"
+			android:text="@string/departurelist_departures"
+			/>
+		<Button
+			android:id="@+id/arrivalbtn"
+    		android:layout_width="0dp"
+    		android:layout_height="wrap_content"
+    		android:background="@drawable/custom_button"
+    		android:layout_weight="1"
+			android:text="@string/departurelist_arrivals"/>
+    </LinearLayout>
 </LinearLayout>