diff --git a/trunk/share-a-bike/app/assistants/kiosk-assistant.js b/trunk/share-a-bike/app/assistants/kiosk-assistant.js
index c39c70f..a606347 100644
--- a/trunk/share-a-bike/app/assistants/kiosk-assistant.js
+++ b/trunk/share-a-bike/app/assistants/kiosk-assistant.js
@@ -1,9 +1,21 @@
 function KioskAssistant(argFromPusher) {
+	this.kiosk = argFromPusher;
 }
 
 KioskAssistant.prototype = {
 	setup: function() {
+		// Setup Application Menu
+		this.controller.setupWidget(Mojo.Menu.appMenu, AddSubMenuAttr, AddSubMenuModel); 
+		
+		// Setup Scene
 		Ares.setupSceneAssistant(this);
+		
+		// Set labels to reflect the data
+		this.$.nameHeader.setTitle(this.kiosk.name);
+		this.$.streetLabel.setLabel(this.kiosk.address);
+		this.$.cityLabel.setLabel(this.kiosk.city + ', ' + this.kiosk.state + ' ' + this.kiosk.zip);
+		this.$.bikesLabel.setLabel('Bikes available: ' + this.kiosk.bikes);
+		this.$.docksLabel.setLabel('Docks available: ' + this.kiosk.docks);
 	},
 	cleanup: function() {
 		Ares.cleanupSceneAssistant(this);
diff --git a/trunk/share-a-bike/app/assistants/main-assistant.js b/trunk/share-a-bike/app/assistants/main-assistant.js
index 879998b..63c8094 100644
--- a/trunk/share-a-bike/app/assistants/main-assistant.js
+++ b/trunk/share-a-bike/app/assistants/main-assistant.js
@@ -132,7 +132,10 @@ MainAssistant.prototype = {
 				bikes: closestKiosks[i].BikesAvailable,
 				docks: closestKiosks[i].DocksAvailable,
 				latitude: closestKiosks[i].Location.Latitude,
-				longitude: closestKiosks[i].Location.Longitude
+				longitude: closestKiosks[i].Location.Longitude,
+				city: closestKiosks[i].Address.City,
+				state: closestKiosks[i].Address.State,
+				zip: closestKiosks[i].Address.ZipCode
 			};
 		}
 		
@@ -158,6 +161,10 @@ MainAssistant.prototype = {
 	},
 	radiusSelectorChange: function(inSender, event) {
 		this.radius = event.value;
+	},
+	kioskListListtap: function(inSender, event) {
+		var argToScene = event.item;
+		this.controller.stageController.pushScene('kiosk', argToScene);
 	}
 
 };
\ No newline at end of file
diff --git a/trunk/share-a-bike/app/views/kiosk/kiosk-chrome.js b/trunk/share-a-bike/app/views/kiosk/kiosk-chrome.js
index 6d44af2..04f1ed1 100644
--- a/trunk/share-a-bike/app/views/kiosk/kiosk-chrome.js
+++ b/trunk/share-a-bike/app/views/kiosk/kiosk-chrome.js
@@ -8,15 +8,18 @@ opus.Gizmo({
 	},
 	chrome: [
 		{
-			name: "pageHeader2",
-			title: "17th & Grant",
+			name: "nameHeader",
+			title: "",
 			subtitle: "",
 			type: "Palm.Mojo.PageHeader",
 			l: 0,
-			t: 0
+			t: 0,
+			styles: {
+				textAlign: "left"
+			}
 		},
 		{
-			name: "scroller1",
+			name: "infoScroller",
 			scrollPosition: {
 				left: 0,
 				top: 0
@@ -26,69 +29,60 @@ opus.Gizmo({
 			t: 0,
 			h: "100%",
 			styles: {
+				margin: "5",
 				cursor: "move",
-				overflow: "hidden"
+				overflow: "hidden",
+				opacity: 1
 			},
 			controls: [
 				{
-					name: "group1",
-					dropTarget: true,
-					label: "Location",
-					type: "Palm.Mojo.Group",
+					name: "addressDivider",
+					label: "Address",
+					type: "Palm.Mojo.Divider",
 					l: 0,
 					t: 0,
-					h: "100",
-					controls: [
-						{
-							name: "row1",
-							dropTarget: true,
-							focusHighlight: false,
-							tapHighlight: false,
-							type: "Palm.Mojo.Row",
-							l: 0,
-							t: 0,
-							h: "100%",
-							controls: [
-								{
-									name: "label2",
-									kind: "title",
-									label: "1700 Grant St",
-									type: "Palm.Mojo.Label",
-									l: "4",
-									t: 0,
-									h: "28"
-								},
-								{
-									name: "label3",
-									kind: "title",
-									label: "Denver, CO 80000",
-									type: "Palm.Mojo.Label",
-									l: "4",
-									t: 28,
-									h: "28"
-								}
-							]
-						}
-					]
+					styles: {
+						opacity: 1
+					}
 				},
 				{
-					name: "group2",
-					dropTarget: true,
-					label: "Availability",
-					type: "Palm.Mojo.Group",
+					name: "streetLabel",
+					label: "",
+					type: "Palm.Mojo.Label",
 					l: 0,
-					t: 95,
-					controls: [
-						{
-							name: "row2",
-							dropTarget: true,
-							focusHighlight: false,
-							tapHighlight: false,
-							type: "Palm.Mojo.Row",
-							l: 0,
-							t: 0
-						}
-					]
+					t: 34,
+					h: "30"
+				},
+				{
+					name: "cityLabel",
+					label: "",
+					type: "Palm.Mojo.Label",
+					l: 0,
+					t: 34,
+					h: "30"
+				},
+				{
+					name: "availDivider",
+					label: "Availability",
+					type: "Palm.Mojo.Divider",
+					l: 0,
+					t: 94
+				},
+				{
+					name: "bikesLabel",
+					label: "",
+					type: "Palm.Mojo.Label",
+					l: 0,
+					t: 128,
+					h: "30"
+				},
+				{
+					name: "docksLabel",
+					label: "",
+					type: "Palm.Mojo.Label",
+					l: 0,
+					t: 158,
+					h: "30"
 				}
 			]
 		}
diff --git a/trunk/share-a-bike/app/views/main/main-chrome.js b/trunk/share-a-bike/app/views/main/main-chrome.js
index 8dd0a85..0690851 100644
--- a/trunk/share-a-bike/app/views/main/main-chrome.js
+++ b/trunk/share-a-bike/app/views/main/main-chrome.js
@@ -22,7 +22,7 @@ opus.Gizmo({
 			}
 		},
 		{
-			name: "scroller1",
+			name: "kiosksScroller",
 			scrollPosition: {
 				left: 0,
 				top: 0
@@ -42,10 +42,9 @@ opus.Gizmo({
 					items: [],
 					useSampleData: false,
 					title: undefined,
-					itemHtml: "<div class=\"palm-row\">\n  <div class=\"kiosk_container\">\n    <div class=\"kiosk_name\">\n      #{name}\n    </div>\n    <div class=\"kiosk_address\">\n      #{address}\n    </div>\n    <div class=\"kiosk_stats\">\n      #{distance} | #{bikes} bikes | #{docks} docks\n    </div>\n  </div>\n</div>",
+					itemHtml: "<div class='result palm-row' x-mojo-tap-highlight='momentary'>\n  <div class=\"palm-row-wrapper\">\n    <div class=\"kiosk_container\">\n      <div class=\"kiosk_name\">\n        #{name}\n      </div>\n      <div class=\"kiosk_address\">\n        #{address}\n      </div>\n      <div class=\"kiosk_stats\">\n        #{distance} | #{bikes} bikes | #{docks} docks\n      </div>\n    </div>\n  </div>\n</div>",
+					onlisttap: "kioskListListtap",
 					swipeToDelete: false,
-					rowTapHighlight: false,
-					rowFocusHighlight: false,
 					type: "Palm.Mojo.List",
 					l: 0,
 					t: 0,
@@ -54,7 +53,7 @@ opus.Gizmo({
 			]
 		},
 		{
-			name: "panel2",
+			name: "buttonsVbox",
 			dropTarget: true,
 			type: "Palm.Mojo.Panel",
 			l: 0,
@@ -62,7 +61,7 @@ opus.Gizmo({
 			h: "120",
 			controls: [
 				{
-					name: "panel1",
+					name: "findHbox",
 					layoutKind: "hbox",
 					dropTarget: true,
 					type: "Palm.Mojo.Panel",
@@ -81,7 +80,7 @@ opus.Gizmo({
 							h: "100%"
 						},
 						{
-							name: "group1",
+							name: "radiusGroup",
 							dropTarget: true,
 							label: "",
 							type: "Palm.Mojo.Group",
@@ -93,7 +92,7 @@ opus.Gizmo({
 							},
 							controls: [
 								{
-									name: "row1",
+									name: "radiusRow",
 									dropTarget: true,
 									type: "Palm.Mojo.Row",
 									l: 0,
@@ -101,7 +100,7 @@ opus.Gizmo({
 									h: "auto",
 									controls: [
 										{
-											name: "listSelector3",
+											name: "radiusSelector",
 											value: 0.5,
 											choices: [
 												{
diff --git a/trunk/share-a-bike/app/views/mapScene/mapScene-chrome.js b/trunk/share-a-bike/app/views/mapScene/mapScene-chrome.js
index 8a38126..3d825d1 100644
--- a/trunk/share-a-bike/app/views/mapScene/mapScene-chrome.js
+++ b/trunk/share-a-bike/app/views/mapScene/mapScene-chrome.js
@@ -8,7 +8,7 @@ opus.Gizmo({
 	},
 	chrome: [
 		{
-			name: "pageHeader1",
+			name: "mapHeader",
 			title: "Kiosks Map",
 			subtitle: "",
 			type: "Palm.Mojo.PageHeader",
@@ -17,8 +17,8 @@ opus.Gizmo({
 		},
 		{
 			name: "kioskMap",
-			latitude: 0,
-			longitude: 0,
+			latitude: 39.739167,
+			longitude: -104.984722,
 			type: "Palm.Mojo.Map",
 			l: 0,
 			t: 49,
diff --git a/trunk/share-a-bike/appinfo.json b/trunk/share-a-bike/appinfo.json
index ad62b5f..0b5eea3 100644
--- a/trunk/share-a-bike/appinfo.json
+++ b/trunk/share-a-bike/appinfo.json
@@ -1,6 +1,6 @@
 {
 	"id": "com.mikeshoup.share-a-bike",
-	"version": "0.1.5", 
+	"version": "0.2.1", 
 	"vendor": "Mike Shoup",
 	"type": "web",
 	"main": "index.html",