diff --git a/res/layout/arrival_listing.xml b/res/layout/arrival_listing.xml
index 2b9e181..a8a00ee 100644
--- a/res/layout/arrival_listing.xml
+++ b/res/layout/arrival_listing.xml
@@ -4,19 +4,24 @@
 	<ImageView android:id="@+id/destinationColorBar" android:src="@drawable/basic_rectangle"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"
 		android:layout_alignParentLeft="true" android:layout_centerVertical="true" />
-	<TextView android:id="@+id/destinationText" style="@style/ArrivalDestinationText"
-		android:layout_alignParentTop="true" android:layout_toRightOf="@id/destinationColorBar" />
+	<LinearLayout android:id="@+id/topRow"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:layout_toRightOf="@id/destinationColorBar"
+		android:layout_alignParentTop="true">
+		<TextView android:id="@+id/destinationText" style="@style/ArrivalDestinationText"
+			android:layout_weight="1" android:singleLine="true"
+			android:ellipsize="marquee" />
+		<ImageView android:id="@+id/bikeIcon" android:src="@drawable/bike"
+			style="@style/BikeIcon" />
+		<TextView android:id="@+id/countdown" style="@style/ArrivalCountdownText"
+			android:gravity="right" />
+	</LinearLayout>
+	<ImageView android:id="@+id/xferIcon" android:src="@drawable/xfer"
+		android:layout_below="@id/topRow" android:layout_alignParentRight="true"
+		style="@style/XferIcon" />
 	<TextView android:id="@+id/trainLengthText" style="@style/ArrivalTrainLengthText"
 		android:layout_toRightOf="@id/destinationColorBar"
-		android:layout_below="@id/destinationText" />
-	<TextView android:layout_alignParentRight="true" android:id="@+id/countdown"
-		style="@style/ArrivalCountdownText" />
+		android:layout_below="@id/topRow" />
 	<TextView android:layout_alignParentRight="true" android:id="@+id/uncertainty"
-		android:layout_below="@id/countdown" style="@style/ArrivalUncertaintyText" />
-	<ImageView android:id="@+id/bikeIcon" android:src="@drawable/bike"
-		android:layout_alignParentTop="true" android:layout_alignParentRight="true"
-		style="@style/BikeIcon" />
-	<ImageView android:id="@+id/xferIcon" android:src="@drawable/xfer"
-		android:layout_below="@id/bikeIcon" android:layout_alignParentRight="true"
-		style="@style/XferIcon" />
+		android:layout_below="@id/topRow" style="@style/ArrivalUncertaintyText" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 22dd137..9d7c199 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,6 +40,7 @@
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:textSize">20dp</item>
 		<item name="android:singleLine">true</item>
+		<item name="android:width">90dp</item>
 	</style>
 	<style name="ArrivalUncertaintyText">
 		<item name="android:layout_width">wrap_content</item>
@@ -50,13 +51,13 @@
 	<style name="BikeIcon">
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginRight">100dp</item>
 		<item name="android:layout_marginTop">5dp</item>
+		<item name="android:layout_marginLeft">5dp</item>
 	</style>
 	<style name="XferIcon">
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
-		<item name="android:layout_marginRight">97dp</item>
-		<item name="android:layout_marginTop">5dp</item>
+		<item name="android:layout_marginRight">87dp</item>
+		<item name="android:layout_marginBottom">5dp</item>
 	</style>
 </resources>