diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ac8f968
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+*.pyc
+
+# Logs and databases #
+######################
+*.log
+
+# OS generated files #
+######################
+.DS_Store*
+ehthumbs.db
+Icon?
+Thumbs.db
diff --git a/README b/README
index 261b80a..153c666 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 
-Today we are releasing the beta version of the New York State Senate mobile app. This is the first mobile app released by a State Legislature. This app brings the functionality of the NYSenate.gov site and the Open Legislation service to users on the go, no matter where they are. From finding your Senator using your current GPS location, to searching legislation or session transcripts, to watching Senate session video from just hours ago, citizens of New York State are now just a tap away from their legislature. 
+Today we are releasing the beta version of the New York State Senate mobile app. This is the first mobile app released by a State Legislature. This app brings the functionality of the NYSenate.gov site and the Open Legislation service to users on the go, no matter where they are. From finding your Senator using your current GPS location, to searching legislation or session transcripts, to watching Senate session video from just hours ago, citizens of New York State are now just a tap away from their legislature.
 
 Read the announcement here: http://www.nysenate.gov/blogs/2010/jun/04/android-app-beta-and-mobile-source-code-released
 
@@ -9,37 +9,37 @@ This application was developed using the Appcelerator Titanium framework which c
 
 Titanium is a cross-platform Javascript-to-Native binding approach to mobile development, which produces highly usable, well performing native mobile applications from one central Javascript application source source. The Javascript code is fully compliant, standards-based scripting, though the application APIs are proprietary to the Titanium platform. However, Appcelerator has open-sourced their code base, which was sufficient for us to choose their platform on which to build our application.
 
-We are also big supporters of pure HTML5+CSS mobile applications, but for now, this is the approach we have taken, and we hope you find value in our source code. 
+We are also big supporters of pure HTML5+CSS mobile applications, but for now, this is the approach we have taken, and we hope you find value in our source code.
 
 ----------------------------------
 Stuff our legal folk make us say:
 
-Appcelerator, Appcelerator Titanium and associated marks and logos are 
-trademarks of Appcelerator, Inc. 
+Appcelerator, Appcelerator Titanium and associated marks and logos are
+trademarks of Appcelerator, Inc.
 
 Titanium is Copyright (c) 2009-2010 by Appcelerator, Inc. All Rights Reserved.
 
 Titanium is licensed under the Apache Public License (Version 2). Please
 see the LICENSE file for the full license.
 
-In order to make the Senate's information and software as public as 
-possible, it is has adopted unique system using two types of licenses  - 
-GNU General Public License as well as the BSD License. This system is 
-meant to ensure the most public licence is used in each specific case 
-such that: 
-
-(i) Any Software released containing components with preexisting GPL 
-copyrights must be released pursuant to a GPL v3 copyright restriction. 
-(ii) Any Software created independently by the Senate without any 
-preexisting licensing restrictions on any of its components shall be 
-released under dual licensing and take one of two forms: (a) a BSD 
-license, or (b) a GPL v3 license.  The ultimate user of such Software 
-shall choose which form of licensing makes the most sense for his or her 
-project. 
-(iii) Regarding Software containing preexisting copyright restrictions 
-other than GPL, the CIO shall make the determination how he or she 
-wishes to release such Software. 
-
-GPL v3: http://www.gnu.org/copyleft/gpl.html 
+In order to make the Senate's information and software as public as
+possible, it is has adopted unique system using two types of licenses  -
+GNU General Public License as well as the BSD License. This system is
+meant to ensure the most public licence is used in each specific case
+such that:
+
+(i) Any Software released containing components with preexisting GPL
+copyrights must be released pursuant to a GPL v3 copyright restriction.
+(ii) Any Software created independently by the Senate without any
+preexisting licensing restrictions on any of its components shall be
+released under dual licensing and take one of two forms: (a) a BSD
+license, or (b) a GPL v3 license.  The ultimate user of such Software
+shall choose which form of licensing makes the most sense for his or her
+project.
+(iii) Regarding Software containing preexisting copyright restrictions
+other than GPL, the CIO shall make the determination how he or she
+wishes to release such Software.
+
+GPL v3: http://www.gnu.org/copyleft/gpl.html
 BSD: http://www.opensource.org/licenses/bsd-license.php
 
diff --git a/Resources/app-grid.js b/Resources/app-grid.js
index 12f2c35..6085198 100644
--- a/Resources/app-grid.js
+++ b/Resources/app-grid.js
@@ -19,7 +19,7 @@ var transpColor = '#00ffffff';
 function buildWindow ()
 {
 
-	var win = Titanium.UI.createWindow({  
+	var win = Titanium.UI.createWindow({
 	    backgroundImage:'img/bg/bglight.jpg',
 	    orientationModes:[Titanium.UI.PORTRAIT],
 	    navBarHidden:true
@@ -28,7 +28,7 @@ function buildWindow ()
 	win.addEventListener('android:back',function(e)
 	{
 		Titanium.API.info("got win android:back event");
-			
+
 	});
 
 	win.open({});
@@ -50,7 +50,7 @@ function buildWindow ()
 		});
 	win.add(imgTitle);
 
-	
+
 	var tableview = Titanium.UI.createTableView({
 		separatorColor: transpColor,
 		top:64,
@@ -91,7 +91,7 @@ function buildWindow ()
 
 	for (var i = 0; i < gridData.length; i++)
 	{
-	
+
 		if (gridColIdx == -1 || gridColIdx > 2)
 		{
 			gridRow = Ti.UI.createTableViewRow({
@@ -109,8 +109,8 @@ function buildWindow ()
 		else if (gridColIdx == 1)
 			imgLeft = xCenter;
 		else if (gridColIdx == 2)
-			imgLeft = xRight;	
-	
+			imgLeft = xRight;
+
 		var img = Ti.UI.createImageView({
 			image:gridData[i].image,
 			top:gridIconBuffer,
@@ -133,7 +133,7 @@ function buildWindow ()
 					modal:true
 
 				});
-				
+
 				newWin.close();
 				newWin.open();
 
@@ -141,21 +141,21 @@ function buildWindow ()
 				{
 
 					Titanium.API.info("got android BACK key event for new win");
-					
+
 
 				});
-		
+
 			}
 			else if (e.source.tabIdx)
 			{
-				
-				
+
+
 				var tabWin = Titanium.UI.createWindow({
 					url:"app-tabs.js",
 					orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT],
 					modal:true
 				});
-			
+
 				tabWin.open({});
 
 				tabWin.addEventListener('close',function(e)
@@ -165,9 +165,9 @@ function buildWindow ()
 
 				});
 			}
-	
+
 		});
-		
+
 		gridRow.add(img);
 
 		var imgLabel = Ti.UI.createLabel({
@@ -180,12 +180,12 @@ function buildWindow ()
 			color:gridFontColor
 		});
 		gridRow.add(imgLabel);
-		
+
 		gridColIdx++;
-	
+
 	}
 
-	
+
 	return win;
 }
 
@@ -219,14 +219,14 @@ if (!hadWelcome)
 			win.open(winSearch,{animated:true});
 
 		}
-		
+
 		Titanium.App.Properties.setString("welcome","done");
-		
+
 	});
 
 	dialog.show();
-	
-				
+
+
 }
 
 
diff --git a/Resources/app-menu.js b/Resources/app-menu.js
index cf5d0f1..0f825d7 100644
--- a/Resources/app-menu.js
+++ b/Resources/app-menu.js
@@ -7,7 +7,7 @@ Titanium.UI.setBackgroundColor(DEFAULT_BAR_COLOR);
 //
 var winHome;
 
-winHome = Titanium.UI.createWindow({  
+winHome = Titanium.UI.createWindow({
     title:'New York State Senate',
     barColor:DEFAULT_BAR_COLOR,
     backgroundImage:'img/bg/bglight.jpg',
@@ -33,8 +33,8 @@ opacity:.8
 
 for (var c = 0; c < data.length; c++)
 {
-	
-	
+
+
 	row = Ti.UI.createTableViewRow({height:60});
 	row.className = 'morerow';
 	row.color = '#333333';
@@ -45,12 +45,12 @@ for (var c = 0; c < data.length; c++)
 	row.oltype = data[c].oltype;
 	row.hasDetail =  data[c].hasDetail;
 	row.leftImage = data[c].icon;
-		
+
 	row.title = data[c].title;
-	
+
 	tableview.appendRow(row);
-		
-	
+
+
 }
 
 
@@ -62,17 +62,17 @@ tableview.addEventListener('click', function(e)
 	if (e.rowData.tab)
 	{
 		//Titanium.UI.currentTab.setActiveTab(e.rowData.tab);
-	}	
+	}
 	else if (e.rowData.ilink)
 	{
 		subWin = Titanium.UI.createWindow({
 			url:e.rowData.ilink,
 			title:e.rowData.pageTitle
-			
+
 		});
 
 		subWin.channel = e.rowData.channel;
-	
+
 		subWin.barColor = DEFAULT_BAR_COLOR;
 		subWin.open({animated:true});
 	}
@@ -133,13 +133,13 @@ if (!hadWelcome)
 			winHome.open(winSearch,{animated:true});
 
 		}
-		
+
 		Titanium.App.Properties.setString("welcome","done");
-		
+
 	});
 
 	dialog.show();
-	
-				
+
+
 }
 
diff --git a/Resources/app-tabs.js b/Resources/app-tabs.js
index d924c94..c4345e8 100644
--- a/Resources/app-tabs.js
+++ b/Resources/app-tabs.js
@@ -11,13 +11,13 @@ function showTabs (tabIdx)
 	//
 	var winHome;
 
-	winHome = Titanium.UI.createWindow({  
+	winHome = Titanium.UI.createWindow({
 	    title:'New York State Senate',
 		url:'views/newsroom.js',
 		orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 	});
 
-	var tabHome = Titanium.UI.createTab({  
+	var tabHome = Titanium.UI.createTab({
 	    icon:'img/tabs/bank.png',
 	    title:'Newsroom',
 	    window:winHome,
@@ -30,15 +30,15 @@ function showTabs (tabIdx)
 	//
 	// create controls tab and root window
 	//
-	var winToday = Titanium.UI.createWindow({  
+	var winToday = Titanium.UI.createWindow({
 	    title:'Calendar',
 		url:'views/today.js',
-	 	
+
 	 		backgroundImage:"img/bg/Default.png",
 		orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 
 	});
-	var tabToday = Titanium.UI.createTab({  
+	var tabToday = Titanium.UI.createTab({
 	    icon:'img/tabs/newspaper.png',
 	    title:'Calendar',
 	    window:winToday,
@@ -51,7 +51,7 @@ function showTabs (tabIdx)
 	var winSenators;
 
 
-	winSenators = Titanium.UI.createWindow({  
+	winSenators = Titanium.UI.createWindow({
 			title:'Senators',
 			url:'views/senators.js',
 			barColor:DEFAULT_BAR_COLOR,
@@ -60,57 +60,57 @@ function showTabs (tabIdx)
 	});
 
 
-	var tabSenators = Titanium.UI.createTab({  
+	var tabSenators = Titanium.UI.createTab({
 	    icon:'img/tabs/man.png',
 	    title:'Senators',
 	    window:winSenators
 	});
 
 
-	tabGroup.addTab(tabSenators); 
+	tabGroup.addTab(tabSenators);
 
 	//fourth tab
-	var winOpenLeg = Titanium.UI.createWindow({  
+	var winOpenLeg = Titanium.UI.createWindow({
 	    title:'Legislation',
 		url:'views/legislation.js',
 	 	barColor:DEFAULT_BAR_COLOR,
 	 		backgroundImage:"img/bg/Default.png",
 		orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 	});
-	var tabOpenLeg = Titanium.UI.createTab({  
+	var tabOpenLeg = Titanium.UI.createTab({
 	    icon:'img/tabs/database.png',
 	    title:'Legislation',
 	    window:winOpenLeg
 	});
 
-	tabGroup.addTab(tabOpenLeg); 
+	tabGroup.addTab(tabOpenLeg);
 
 	//fifth tab
-	var winMore = Titanium.UI.createWindow({  
+	var winMore = Titanium.UI.createWindow({
 	    title:'More',
 		url:'views/more.js',
 	 	barColor:DEFAULT_BAR_COLOR,
 	 	backgroundImage:"img/bg/Default.png",
 		orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 	});
-	var tabMore = Titanium.UI.createTab({  
+	var tabMore = Titanium.UI.createTab({
 	    icon:'img/tabs/preferences.png',
 	    title:'More',
 	    window:winMore
 	});
 
-	tabGroup.addTab(tabMore); 
+	tabGroup.addTab(tabMore);
 
 	tabGroup.addEventListener('blur', function(e)
 	{
 		Titanium.API.info("got tab win blur key event!");
-	
+
 	});
 
 	tabGroup.addEventListener('close',function(e)
 	{
 		Titanium.API.info("got tab win close key event!");
-	
+
 	});
 
 	tabGroup.close();
@@ -130,29 +130,29 @@ Ti.UI.currentWindow.addEventListener('focus', function(e)
 		Titanium.API.info("TAB PARENT - got focus; count=" + focusCount);
 
 		if (focusCount > 1)
-		{ 
+		{
 			Ti.API.info("closing curr window");
 			Ti.UI.currentWindow.close();
 		}
-	
+
 	});
 
 Ti.UI.currentWindow.addEventListener('blur', function(e)
 	{
 		Titanium.API.info("TAB PARENT - got blur");
-	
+
 	});
 
 Ti.UI.currentWindow.addEventListener('close', function(e)
 	{
 		Titanium.API.info("TAB PARENT - got close");
-	
+
 	});
 
 Ti.UI.currentWindow.addEventListener('android:back', function(e)
 	{
 		Titanium.API.info("TAB PARENT - got android:back!");
-	
+
 	});
 
 showTabs(0);
diff --git a/Resources/app.js b/Resources/app.js
index a385b23..6dc4bd1 100644
--- a/Resources/app.js
+++ b/Resources/app.js
@@ -7,10 +7,10 @@ Titanium.UI.setBackgroundColor(DEFAULT_BAR_COLOR);
 //
 var win;
 
-win = Titanium.UI.createWindow({  
+win = Titanium.UI.createWindow({
     title:'New York State Senate',
     barColor:DEFAULT_BAR_COLOR,
-    orientationModes:[Titanium.UI.PORTRAIT],  
+    orientationModes:[Titanium.UI.PORTRAIT],
     navBarHidden:true
 });
 
@@ -39,7 +39,7 @@ var data = [
 	{title:'Session Calendar', summary:'', hasDetail:true,ilink:'tabs.js',tabIdx:1,  icon:'img/icons/calendar.png'},
 	{title:'Newsroom', summary:'', hasDetail:true,ilink:'tabs.js',tabIdx:2,  icon:'img/icons/comments.png'},
 	{title:'Open Legislation', summary:'', hasDetail:true,  ilink:'tabs.js',tabIdx:3,  icon:'img/icons/legislation.png'},
-	{title:'Latest Videos', summary:'', hasDetail:true,  ilink:'inc/youtube.js', icon:'img/icons/videos.png'},	
+	{title:'Latest Videos', summary:'', hasDetail:true,  ilink:'inc/youtube.js', icon:'img/icons/videos.png'},
 	{title:'Find Your Senator', summary:'', hasDetail:true,  ilink:'views/findsenator.js', icon:'img/icons/search.png'},
 	{title:'More Information', summary:'', hasDetail:true,  ilink:'tabs.js',tabIdx:4,   icon:'img/icons/more.png'},
 	{title:'Visit NYSenate.gov', summary:'', hasDetail:true, elink:'http://nysenate.gov',  icon:'img/icons/home.png'},
@@ -55,8 +55,8 @@ separatorColor:"#cccccc"
 
 for (var c = 0; c < data.length; c++)
 {
-	
-	
+
+
 	row = Ti.UI.createTableViewRow({height:60, fontSize:'14pt', color:'#333333'});
 	row.pageTitle = data[c].title;
 	row.link =  data[c].link;
@@ -85,10 +85,10 @@ for (var c = 0; c < data.length; c++)
 		color:'#333333'
 	});
 	row.add(labelTitle);
-	
+
 	tableview.appendRow(row);
-		
-	
+
+
 }
 
 
@@ -100,7 +100,7 @@ tableview.addEventListener('click', function(e)
 	if (e.rowData.tab)
 	{
 		//Titanium.UI.currentTab.setActiveTab(e.rowData.tab);
-	}	
+	}
 	else if (e.rowData.ilink)
 	{
 		subWin = Titanium.UI.createWindow({
@@ -115,33 +115,33 @@ tableview.addEventListener('click', function(e)
 		subWin.barColor = DEFAULT_BAR_COLOR;
 		subWin.open({animated:true});
 		subWin.focusCount = 0;
-		
+
 		subWin.addEventListener('focus', function(e)
 		{
 
 			Titanium.API.info("TAB PARENT - got focus");
-			
+
 			subWin.focusCount = subWin.focusCount + 1;
 
 			if (subWin.focusCount > 1)
 				subWin.close();
-			
+
 			//	Ti.API.info("closing curr window");
 			//	Ti.UI.currentWindow.close();
-			
-			
+
+
 		});
 
 		subWin.addEventListener('blur', function(e)
 			{
 				Titanium.API.info("TAB PARENT - got blur");
-	
+
 			});
 
 		subWin.addEventListener('close', function(e)
 			{
 				Titanium.API.info("TAB PARENT - got close");
-	
+
 			});
 
 		subWin.addEventListener('android:back', function(e)
@@ -212,13 +212,13 @@ if (!hadWelcome)
 			win.open(winSearch,{animated:true});
 
 		}
-		
+
 		Titanium.App.Properties.setString("welcome","done");
-		
+
 	});
 
 	dialog.show();
-	
-				
+
+
 }
 
diff --git a/Resources/globals.js b/Resources/globals.js
index 83730d6..71cfd4f 100644
--- a/Resources/globals.js
+++ b/Resources/globals.js
@@ -13,7 +13,7 @@ var webModal;
 var webModalView;
 var toolActInd;
 var currentLink;
-		
+
 var btnSearch = Titanium.UI.createButton({
 	title:'Browser',
 	style:Titanium.UI.iPhone.SystemButtonStyle.PLAIN
@@ -22,7 +22,7 @@ var btnSearch = Titanium.UI.createButton({
 btnSearch.addEventListener('click',function()
 {
 	Titanium.Platform.openURL(currentLink);
-	
+
 });
 
 /*
@@ -60,15 +60,15 @@ function getSenatorJSON ()
 	if (!senatorJson)
 	{
 		//Titanium.API.info("loading senators json");
-		
-		
+
+
 		var cachedFeed = getCachedFile("senatorsJson");
 
 		//Titanium.API.info("parsing senators json: " + cachedFeed);
 
 		if (cachedFeed)
 			senatorJson = JSON.parse(cachedFeed.text);
-	 	
+
 	}
 
 	return senatorJson;
@@ -78,107 +78,107 @@ function processNYSenateHtml (rawHTML)
 {
 	var respText = rawHTML;
 	var baseHref = "http://nysenate.gov";
-	
+
 	var contentIdx = respText.indexOf('id="content">');
-	
+
 	if (contentIdx && contentIdx != -1)
 	{
 		respText = respText.substring(contentIdx+13);
-		
+
 		respText = respText.substring(0, respText.indexOf('<!-- /#content-inner') );
-		
+
 		respText = respText.replace("<div>","");
 		respText = respText.replace("</div>","");
 		/*
 		var videoIdIdx = respText.indexOf("http://www.youtube.com/v/");
-		
+
 		if (videoIdIdx !=-1)
 		{
-			
+
 			var vguid = respText.substring(videoIdIdx+25);
 			vguid = vguid.substring(0,vguid.indexOf('&'));
-			
+
 			var thumbPlayer = '<embed id="yt" src="http://www.youtube.com/v/' + vguid + '" type="application/x-shockwave-flash" width="320" height="240"></embed>';
-			
+
 			respText = respText + "<br/>" + thumbPlayer;
-			
+
 		//	Titanium.API.debug("adding youtube player: " + respText);
-			
+
 		}
-		
-		
+
+
 		respText = '<html><head><style>#emvideo-youtube-flash-1, .group-video, object {display:none;} .links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:295px;max-height:161px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><base href="' + baseHref + '"/>' + respText + '</body></html>';
 		*/
-	
+
 			respText = '<html><head><style>#emvideo-youtube-flash-1, .group-video, object {display:none;} .links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:295px;max-height:161px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><base href="' + baseHref + '"/>' + respText + '</body></html>';
 
 	}
-	
+
 	return respText;
 }
 
 
 function createWebView ()
 {
-	
+
 		webModal = Ti.UI.createWindow({
-			
-			barColor:DEFAULT_BAR_COLOR	
-	
+
+			barColor:DEFAULT_BAR_COLOR
+
 		});
-		
+
 		webModal.orientationModes = [
 			Titanium.UI.PORTRAIT,
 			Titanium.UI.LANDSCAPE_LEFT,
 			Titanium.UI.LANDSCAPE_RIGHT
 		];
-				
-	
+
+
 		webModalView = Ti.UI.createWebView();
 		webModalView.scalesPageToFit = true;
-		
+
 		webModal.add(webModalView);
-		
+
 		if (Titanium.Platform.name == 'iPhone OS')
 		{
 			webModal.rightNavButton = btnSearch;
 		}
-	
-		
-		
+
+
+
 		webModalView.addEventListener('beforeload',function(e)
 		{
-			
+
 			showLoadingDialog("Loading","Loading web content...");
 
 		});
-			
+
 		webModalView.addEventListener('load',function(e)
 		{
 			Ti.API.debug("webview loaded: "+e.url);
-			
+
 			hideLoadingDialog();
 
 		});
-	
+
 		return webModalView;
 }
 
 function showWebModal(wTitle, wUrl)
 {
 		Titanium.API.info("loading modal web view for: " + wUrl);
-		
+
 		currentLink = wUrl;
-		
+
 		createWebView();
-		
+
 		webModal.title = wTitle;
-		
+
 		Titanium.UI.currentTab.open(webModal,{animated:true});
 		webModalView.html = null;
 		webModalView.url = wUrl;
 		webModalView.scalesPageToFit = true;
-		
+
 };
 
 function playYouTube (vtitle, vguid)
@@ -198,102 +198,102 @@ function playYouTube (vtitle, vguid)
 
 function showYouTubeVideo (wTitle, wYouTube)
 {
-	
+
 	var wYouTubeId = wYouTube.substring(wYouTube.indexOf("v=")+2);
-	
+
 	if (wYouTubeId.indexOf("&") != -1)
 	{
 		wYouTubeId = wYouTubeId.substring(0,wYouTubeId.indexOf("&"));
 	}
-	
+
 	Titanium.API.info("loading youtube page: " + wYouTubeId + " / " + wYouTube);
-	
+
 	var youTubePlayer = '<html><body><center><div id="emvideo-youtube-flash-wrapper-1"><object type="application/x-shockwave-flash" height="350" width="425" data="http://www.youtube.com/v/' + wYouTubeId + '&amp;rel=0&amp;fs=1" id="emvideo-youtube-flash-1" allowFullScreen="true"> <param name="movie" value="http://www.youtube.com/v/' + wYouTubeId + '&amp;rel=0&amp;fs=1" />  <param name="allowScriptAcess" value="sameDomain"/>  <param name="quality" value="best"/>  <param name="allowFullScreen" value="true"/>  <param name="bgcolor" value="#FFFFFF"/>  <param name="scale" value="noScale"/> <param name="salign" value="TL"/> <param name="FlashVars" value="playerMode=embedded" /> <param name="wmode" value="transparent" /> <a href="http://www.youtube.com/watch?v=' + wYouTubeId + '">	<img src="http://img.youtube.com/vi/' + wYouTubeId + '/0.jpg" width="480" height="360" alt="[Video title]" />YouTube Video</a></object></div></center></body></html>';
 
 		showHTMLContent(wTitle, '', youTubePlayer);
-	
+
 }
 
 function showHTMLContent(wTitle, wUrl, wHTMLContent)
 {
 	//Titanium.API.debug("loading html web view content: " + wHTMLContent);
-		
+
 		currentLink = wUrl;
-		
+
 		createWebView();
-		
-		
+
+
 		webModal.title = wTitle;
-		
+
 		Titanium.UI.currentTab.open(webModal,{animated:true});
-		
+
 		webModalView.html = wHTMLContent;
-		
-	
+
+
 };
 
 function showNYSenateContent(wTitle, wUrl)
 {
 
 	//Titanium.API.info("loading modal web view for: " + wUrl);
-			
+
 			currentLink = wUrl;
-			
+
 			createWebView();
-			
+
 			webModal.title = wTitle;
 			webModalView.title = wTitle;
 			webModalView.html = "";
-			
+
 			Titanium.UI.currentTab.open(webModal,{animated:true});
-			
+
 		var cFile = null;//getCachedFile(wUrl);
-		
+
 		if (cFile)
 		{
-			
+
 			webModalView.html = processNYSenateHtml(cFile);
-					
+
 			hideLoadingDialog();
 		}
 		else
 		{
-			
-			
+
+
 			var xhr = Ti.Network.createHTTPClient();
 			xhr.setTimeout(30000);
 			xhr.open("GET",wUrl);
-	
+
 			xhr.onload = function()
 			{
-				
+
 				cacheFile(wUrl, this.responseText);
-				
+
 				webModalView.html = processNYSenateHtml(this.responseText);
-					
-				
+
+
 				hideLoadingDialog();
-					
+
 			};
-			
-		
+
+
 			xhr.send();
-	}		
+	}
 };
 
 
 function getCachedFile (cacheUrl)
 {
 
-		
+
 		var filename = Titanium.Utils.md5HexDigest(cacheUrl);
 
 		try
 		{
 		//	Ti.API.debug('looking for cached file md5: ' + filename);
-	
+
 			var f = Titanium.Filesystem.getFile(Titanium.Filesystem.applicationDataDirectory,filename);
-			
+
 			if (f)
 			{
 			//	Ti.API.debug('found cached file: ' + f.nativePath);
@@ -306,9 +306,9 @@ function getCachedFile (cacheUrl)
 		{
 			//Ti.API.debug('no cache for: ' + cacheUrl);
 			return null;
-		}	
-		
-		
+		}
+
+
 		return null;
 
 }
@@ -319,61 +319,61 @@ function cacheFile (fileUrl, fileData, fileCallbackFunction)
 	if (fileData)
 	{
 		var filename = Titanium.Utils.md5HexDigest(fileUrl);
-			
+
 			//Ti.API.debug('saving file ' + fileUrl + ' as : ' + filename);
-	
+
 			var f = Titanium.Filesystem.getFile(Titanium.Filesystem.applicationDataDirectory,filename);
-			
+
 			f.write(fileData);
-			
+
 			if(fileCallbackFunction)
 				fileCallbackFunction(fileUrl,f);
-	
+
 	}
 	else
 	{
 		var c = Titanium.Network.createHTTPClient();
-		
+
 		c.setTimeout(30000);
-		
+
 		c.onload = function()
 		{
 			var filename = Titanium.Utils.md5HexDigest(fileUrl);
-			
+
 			//Ti.API.info('saving file ' + fileUrl + ' as : ' + filename);
-	
+
 			var f = Titanium.Filesystem.getFile(Titanium.Filesystem.applicationDataDirectory,filename);
-			
+
 			f.write(this.responseData);
-			
+
 			if(fileCallbackFunction)
 				fileCallbackFunction(fileUrl,f);
 
 		};
-		
+
 		c.ondatastream = function(e)
 		{
 			//ind.value = e.progress ;
 			//Ti.API.info('ONDATASTREAM1 - PROGRESS: ' + e.progress);
 		};
-		
+
 		c.error = function(e)
 		{
 			//Ti.UI.createAlertDialog({title:'XHR', message:'Error: ' + e.error}).show();
 			//Ti.API.debug('ONDATASTREAM1 - ERROR: ' + e.error);
 		};
-		
+
 		c.open('GET', fileUrl);
-		
+
 		// send the data
 		c.send();
-	}	
+	}
 }
 
 function processHtml (rawHTML)
 {
 
-	rawHTML = rawHTML.replace(/(Related information:)/gi," ");	
+	rawHTML = rawHTML.replace(/(Related information:)/gi," ");
 	rawHTML = rawHTML.replace(/(Authored by Senator:)/gi," ");
 	rawHTML = rawHTML.replace(/(Authored by Senator)/gi," ");
 	rawHTML = rawHTML.replace(/(Feature image:)/gi," ");
@@ -382,7 +382,7 @@ function processHtml (rawHTML)
 	rawHTML = rawHTML.replace(/(File\:)/gi," ");
 	rawHTML = rawHTML.replace(/&lt;p&gt;/gi," ");
 	rawHTML = rawHTML.replace(/&lt;\/p&gt;/gi," ");
-	
+
 	rawHTML=rawHTML.replace(/<br>/gi, " ");
 	rawHTML=rawHTML.replace(/  /gi, " ");
 	rawHTML=rawHTML.replace(/&nbsp;/gi, " ");
@@ -391,26 +391,26 @@ function processHtml (rawHTML)
 	rawHTML=rawHTML.replace(/<a.*href="(.*?)".*>(.*?)<\/a>/gi, "");
 	rawHTML=rawHTML.replace(/<(?:.|\s)*?>/g, "");
 	rawHTML=rawHTML.replace(/^\s*|\s*$/g,'');
-	
+
 	rawHTML = rawHTML.replace(/(\r\n|\n|\r)/gm," ");
-	
+
 	rawHTML = trim(rawHTML);
-	
+
 	return rawHTML;
 }
 
 
 
-function trim(s) 
-{ 
-    var l=0; 
-    var r= s.length-1; 
-    while(l < s.length && s[l] == ' ') 
-    {     l++; } 
-    while(r > l && s[r] == ' ') 
-    {     r-=1;     } 
-    return s.substring(l, r+1); 
-} 
+function trim(s)
+{
+    var l=0;
+    var r= s.length-1;
+    while(l < s.length && s[l] == ' ')
+    {     l++; }
+    while(r > l && s[r] == ' ')
+    {     r-=1;     }
+    return s.substring(l, r+1);
+}
 
 // Simulates PHP's date function
 Date.prototype.format = function(format) {
@@ -431,7 +431,7 @@ Date.replaceChars = {
 	longMonths: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
 	shortDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
 	longDays: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-	
+
 	// Day
 	d: function() { return (this.getDate() < 10 ? '0' : '') + this.getDate(); },
 	D: function() { return Date.replaceChars.shortDays[this.getDay()]; },
@@ -484,28 +484,28 @@ Date.replaceChars = {
 *  http://www.webtoolkit.info/
 *
 **/
- 
+
 var Url = {
- 
+
 	// public method for url encoding
 	encode : function (string) {
 		return escape(this._utf8_encode(string));
 	},
- 
+
 	// public method for url decoding
 	decode : function (string) {
 		return this._utf8_decode(unescape(string));
 	},
- 
+
 	// private method for UTF-8 encoding
 	_utf8_encode : function (string) {
 		string = string.replace(/\r\n/g,"\n");
 		var utftext = "";
- 
+
 		for (var n = 0; n < string.length; n++) {
- 
+
 			var c = string.charCodeAt(n);
- 
+
 			if (c < 128) {
 				utftext += String.fromCharCode(c);
 			}
@@ -518,22 +518,22 @@ var Url = {
 				utftext += String.fromCharCode(((c >> 6) & 63) | 128);
 				utftext += String.fromCharCode((c & 63) | 128);
 			}
- 
+
 		}
- 
+
 		return utftext;
 	},
- 
+
 	// private method for UTF-8 decoding
 	_utf8_decode : function (utftext) {
 		var string = "";
 		var i = 0;
 		var c = c1 = c2 = 0;
- 
+
 		while ( i < utftext.length ) {
- 
+
 			c = utftext.charCodeAt(i);
- 
+
 			if (c < 128) {
 				string += String.fromCharCode(c);
 				i++;
@@ -549,12 +549,12 @@ var Url = {
 				string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
 				i += 3;
 			}
- 
+
 		}
- 
+
 		return string;
 	}
- 
+
 }
 
 //
@@ -568,7 +568,7 @@ function isIPhone3_2_Plus()
 		var version = Titanium.Platform.version.split(".");
 		var major = parseInt(version[0]);
 		var minor = parseInt(version[1]);
-		
+
 		// can only test this support on a 3.2+ device
 		if (major > 3 || (major == 3 && minor > 1))
 		{
@@ -585,7 +585,7 @@ function isiOS4Plus()
 	{
 		var version = Titanium.Platform.version.split(".");
 		var major = parseInt(version[0]);
-		
+
 		// can only test this support on a 3.2+ device
 		if (major >= 4)
 		{
diff --git a/Resources/inc/drupal_services.js b/Resources/inc/drupal_services.js
index 31a7e8b..b02827d 100644
--- a/Resources/inc/drupal_services.js
+++ b/Resources/inc/drupal_services.js
@@ -33,7 +33,7 @@ var obj = {
 
 // create the hash using secure hash algorithm using 256bit encryption
 obj.hash = HMAC_SHA256_MAC(apikey, obj.domain_time_stamp+";"+obj.domain_name+";"+obj.nonce+";"+drupal_method);
-                 
+
 // this is your view name, be sure your authentication key allows access to views.get
 obj.method = drupal_method;
 
diff --git a/Resources/inc/indicator.js b/Resources/inc/indicator.js
index 97651b5..aa2f9a1 100644
--- a/Resources/inc/indicator.js
+++ b/Resources/inc/indicator.js
@@ -10,7 +10,7 @@ function showIndicator()
 		height:150,
 		width:150
 	});
-	
+
 	// black view
 	var indView = Titanium.UI.createView({
 		height:150,
@@ -20,7 +20,7 @@ function showIndicator()
 		opacity:0.8
 	});
 	indWin.add(indView);
-	
+
 	// loading indicator
 	actInd = Titanium.UI.createActivityIndicator({
 		style:Titanium.UI.iPhone.ActivityIndicatorStyle.BIG,
@@ -28,7 +28,7 @@ function showIndicator()
 		width:30
 	});
 	indWin.add(actInd);
-	
+
 	// message
 	var message = Titanium.UI.createLabel({
 		text:'Loading',
@@ -41,7 +41,7 @@ function showIndicator()
 	indWin.add(message);
 	indWin.open();
 	actInd.show();
-	
+
 };
 
 function hideIndicator()
diff --git a/Resources/inc/jssha256.js b/Resources/inc/jssha256.js
index 380acbf..70dd15a 100644
--- a/Resources/inc/jssha256.js
+++ b/Resources/inc/jssha256.js
@@ -23,35 +23,35 @@
  * This is a JavaScript implementation of the SHA256 secure hash function
  * and the HMAC-SHA256 message authentication code (MAC).
  *
- * The routines' well-functioning has been verified with the test vectors 
- * given in FIPS-180-2, Appendix B and IETF RFC 4231. The HMAC algorithm 
- * conforms to IETF RFC 2104. 
+ * The routines' well-functioning has been verified with the test vectors
+ * given in FIPS-180-2, Appendix B and IETF RFC 4231. The HMAC algorithm
+ * conforms to IETF RFC 2104.
  *
  * The following code example computes the hash value of the string "abc".
  *
  *    SHA256_init();
  *    SHA256_write("abc");
- *    digest = SHA256_finalize();  
+ *    digest = SHA256_finalize();
  *    digest_hex = array_to_hex_string(digest);
- * 
+ *
  * Get the same result by calling the shortcut function SHA256_hash:
- * 
+ *
  *    digest_hex = SHA256_hash("abc");
- * 
- * In the following example the calculation of the HMAC of the string "abc" 
+ *
+ * In the following example the calculation of the HMAC of the string "abc"
  * using the key "secret key" is shown:
- * 
+ *
  *    HMAC_SHA256_init("secret key");
  *    HMAC_SHA256_write("abc");
  *    mac = HMAC_SHA256_finalize();
  *    mac_hex = array_to_hex_string(mac);
  *
  * Again, the same can be done more conveniently:
- * 
+ *
  *    mac_hex = HMAC_SHA256_MAC("secret key", "abc");
  *
  * Note that the internal state of the hash function is held in global
- * variables. Therefore one hash value calculation has to be completed 
+ * variables. Therefore one hash value calculation has to be completed
  * before the next is begun. The same applies the the HMAC routines.
  *
  * Report bugs to: jssha256 AT point-at-infinity.org
@@ -85,20 +85,20 @@ function array_to_hex_string(ary) {
 
 /* The following are the SHA256 routines */
 
-/* 
+/*
    SHA256_init: initialize the internal state of the hash function. Call this
    function before calling the SHA256_write function.
 */
 
 function SHA256_init() {
-  SHA256_H = new Array(0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 
+  SHA256_H = new Array(0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
     0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19);
   SHA256_buf = new Array();
   SHA256_len = 0;
 }
 
 /*
-   SHA256_write: add a message fragment to the hash function's internal state. 
+   SHA256_write: add a message fragment to the hash function's internal state.
    'msg' may be given as string or as byte array and may have arbitrary length.
 
 */
@@ -116,7 +116,7 @@ function SHA256_write(msg) {
 
 /*
    SHA256_finalize: finalize the hash value calculation. Call this function
-   after the last call to SHA256_write. An array of 32 bytes (= 256 bits) 
+   after the last call to SHA256_write. An array of 32 bytes (= 256 bits)
    is returned.
 */
 
@@ -154,9 +154,9 @@ function SHA256_finalize() {
 }
 
 /*
-   SHA256_hash: calculate the hash value of the string or byte array 'msg' 
-   and return it as hexadecimal string. This shortcut function may be more 
-   convenient than calling SHA256_init, SHA256_write, SHA256_finalize 
+   SHA256_hash: calculate the hash value of the string or byte array 'msg'
+   and return it as hexadecimal string. This shortcut function may be more
+   convenient than calling SHA256_init, SHA256_write, SHA256_finalize
    and array_to_hex_string explicitly.
 */
 
@@ -198,7 +198,7 @@ function HMAC_SHA256_init(key) {
 }
 
 /*
-   HMAC_SHA256_write: process a message fragment. 'msg' may be given as 
+   HMAC_SHA256_write: process a message fragment. 'msg' may be given as
    string or as byte array and may have arbitrary length.
 */
 
@@ -226,9 +226,9 @@ function HMAC_SHA256_finalize() {
 
 /*
    HMAC_SHA256_MAC: calculate the HMAC value of message 'msg' under key 'key'
-   (both may be of type string or byte array); return the MAC as hexadecimal 
-   string. This shortcut function may be more convenient than calling 
-   HMAC_SHA256_init, HMAC_SHA256_write, HMAC_SHA256_finalize and 
+   (both may be of type string or byte array); return the MAC as hexadecimal
+   string. This shortcut function may be more convenient than calling
+   HMAC_SHA256_init, HMAC_SHA256_write, HMAC_SHA256_finalize and
    array_to_hex_string explicitly.
 */
 
@@ -244,21 +244,21 @@ function HMAC_SHA256_MAC(key, msg) {
 
 /* The following lookup tables and functions are for internal use only! */
 
-SHA256_hexchars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 
+SHA256_hexchars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
   'a', 'b', 'c', 'd', 'e', 'f');
 
 SHA256_K = new Array(
-  0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 
-  0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 
-  0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, 
-  0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 
-  0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 
-  0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 
-  0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, 
-  0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 
-  0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 
-  0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 
-  0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 
+  0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
+  0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+  0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
+  0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+  0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
+  0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+  0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
+  0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+  0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
+  0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+  0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
 );
 
 function SHA256_sigma0(x) {
@@ -270,12 +270,12 @@ function SHA256_sigma1(x) {
 }
 
 function SHA256_Sigma0(x) {
-  return ((x >>> 2) | (x << 30)) ^ ((x >>> 13) | (x << 19)) ^ 
+  return ((x >>> 2) | (x << 30)) ^ ((x >>> 13) | (x << 19)) ^
     ((x >>> 22) | (x << 10));
 }
 
 function SHA256_Sigma1(x) {
-  return ((x >>> 6) | (x << 26)) ^ ((x >>> 11) | (x << 21)) ^ 
+  return ((x >>> 6) | (x << 26)) ^ ((x >>> 11) | (x << 21)) ^
     ((x >>> 25) | (x << 7));
 }
 
@@ -289,11 +289,11 @@ function SHA256_Maj(x, y, z) {
 
 function SHA256_Hash_Word_Block(H, W) {
   for(var i = 16; i < 64; i++)
-    W[i] = (SHA256_sigma1(W[i - 2]) +  W[i - 7] + 
+    W[i] = (SHA256_sigma1(W[i - 2]) +  W[i - 7] +
       SHA256_sigma0(W[i - 15]) + W[i - 16]) & 0xffffffff;
   var state = new Array().concat(H);
   for(var i = 0; i < 64; i++) {
-    var T1 = state[7] + SHA256_Sigma1(state[4]) + 
+    var T1 = state[7] + SHA256_Sigma1(state[4]) +
       SHA256_Ch(state[4], state[5], state[6]) + SHA256_K[i] + W[i];
     var T2 = SHA256_Sigma0(state[0]) + SHA256_Maj(state[0], state[1], state[2]);
     state.pop();
@@ -307,7 +307,7 @@ function SHA256_Hash_Word_Block(H, W) {
 function SHA256_Hash_Byte_Block(H, w) {
   var W = new Array(16);
   for(var i = 0; i < 16; i++)
-    W[i] = w[4 * i + 0] << 24 | w[4 * i + 1] << 16 | 
+    W[i] = w[4 * i + 0] << 24 | w[4 * i + 1] << 16 |
       w[4 * i + 2] << 8 | w[4 * i + 3];
   SHA256_Hash_Word_Block(H, W);
 }
diff --git a/Resources/inc/map.js b/Resources/inc/map.js
index d57d91e..e5f0aef 100644
--- a/Resources/inc/map.js
+++ b/Resources/inc/map.js
@@ -17,7 +17,7 @@ var mapview = Titanium.Map.createView({
 	annotations:[]
 });
 
- 
+
 win.add(mapview);
 
 function loadKMLPoly (kmlUrl)
@@ -25,53 +25,53 @@ function loadKMLPoly (kmlUrl)
 	var centerLat;
 	var centerLon;
 	var centerDelta = 5;
-	
+
    var xhr = Titanium.Network.createHTTPClient();
     xhr.open('GET',kmlUrl);
 
     xhr.onload = function(){
-        // Now parse the XML 
+        // Now parse the XML
         var xml = this.responseXML;
         var points = [];
-        
+
         var coords = xml.documentElement.getElementsByTagName("coordinates");
-        
-        
+
+
         for(var cc=0; cc < coords.length; cc++) {
             var line = coords.item(cc);
             var str = line.firstChild.text.split("\n");
-           
+
             for(dd = 0; dd < str.length; dd++) {
-            	
+
             	if (str[dd].length > 0)
-            	{            	
+            	{
 				//	Ti.API.info("coord" + dd + ": " + str[dd]);
 
 					var loc = str[dd].split(',');
-					
+
 					if(loc[0] && loc[1]) {
-					
+
 						if (!centerLat)
 							centerLat = [loc[1],loc[1]];
-							
+
 						centerLat[0] = Math.max(centerLat[0],loc[1]);
 						centerLat[1] = Math.min(centerLat[1],loc[1]);
 					//	Ti.API.info("lat max:" + centerLat[0] + " min:" + centerLat[1]);
-						
+
 						if (!centerLon)
 							centerLon = [loc[0],loc[0]];
-							
+
 						centerLon[0] = Math.min(centerLon[0],loc[0]);
 						centerLon[1] = Math.max(centerLon[1],loc[0]);
 				//		Ti.API.info("long max:" + centerLon[1] + " min:" + centerLon[0]);
-						
 
-						points.push({latitude: loc[1], 
+
+						points.push({latitude: loc[1],
 							 longitude: loc[0]});
 					}
 				}
             }
-            
+
         }
 
         var route = {
@@ -80,10 +80,10 @@ function loadKMLPoly (kmlUrl)
                 color:routeColor,
                 width:3
             };
- 
+
         // add a route
         mapview.addRoute(route);
-        
+
        var latDif = (Math.abs(centerLat[1] - centerLat[0])/2);
        var lonDif = (Math.abs(centerLon[1] - centerLon[0])/2);
        centerDelta = centerDelta * latDif;
@@ -92,11 +92,11 @@ function loadKMLPoly (kmlUrl)
        centerLon[2] = centerLon[0] + lonDif;
 
 		Ti.API.info("map center: " + centerLat[2] + "," + centerLon[2]);
-		
+
        mapview.setLocation({latitude:centerLat[2],longitude:centerLon[2],latitudeDelta:centerDelta,longitudeDelta:centerDelta});
-    };  
+    };
     xhr.send();
-    
+
   }
 
 
diff --git a/Resources/inc/rss.js b/Resources/inc/rss.js
index 9ea33ae..01ad336 100644
--- a/Resources/inc/rss.js
+++ b/Resources/inc/rss.js
@@ -16,33 +16,33 @@ var cachedFeed = getCachedFile(listUrl);
 
 if (cachedFeed)
 {
-	var doc = Titanium.XML.parseString(cachedFeed).documentElement;	
+	var doc = Titanium.XML.parseString(cachedFeed).documentElement;
 	parseDoc(doc);
-	
-		
+
+
 }
 */
-	
+
 	var xhr = Ti.Network.createHTTPClient();
-	
+
 	xhr.onerror = function ()
 	{
 		toolActInd.hide();
 	}
-	
+
 	xhr.onload = function()
 	{
 		cacheFile(listUrl, this.responseText);
-		
+
 		var doc = Titanium.XML.parseString(this.responseText).documentElement;
-	
+
 		parseDoc(doc);
-	
+
 		toolActInd.hide();
-		
+
 	};
-	
-	
+
+
 	xhr.open("GET",listUrl);
 	xhr.send();
 
@@ -61,27 +61,27 @@ function parseDoc(doc)
 	Titanium.API.debug("viewing items: " + items.length);
 
 	var greyBg = false;
-		
+
 	for (c = 0; c < items.length; c++)
 	{
 		try
 		{
 			item = items.item(c);
-		
+
 			var title = item.getElementsByTagName("title").item(0).text;
-			
+
 			Titanium.API.debug("parsing item: " + title);
 
 			var summary = "Published " + item.getElementsByTagName("pubDate").item(0).text;
-			
+
 			var row = Ti.UI.createTableViewRow({height:80});
-			
+
 			row.hasChild = true;
 			row.htmlTitle = title;
-			
+
 			row.url = item.getElementsByTagName("link").item(0).text;
 			row.htmlview = item.getElementsByTagName("description").item(0).text;
-			
+
 			var labelTitle = Ti.UI.createLabel({
 				text:title,
 				left:5,
@@ -91,7 +91,7 @@ function parseDoc(doc)
 				color:"#000000"
 			});
 			row.add(labelTitle);
-			
+
 			var labelSummary = Ti.UI.createLabel({
 				text:summary,
 				left:5,
@@ -100,9 +100,9 @@ function parseDoc(doc)
 				color:"#333333"
 			});
 			row.add(labelSummary);
-			
-			
-			
+
+
+
 			if (greyBg)
 			{
 				row.backgroundColor="#eeeeee";
@@ -111,9 +111,9 @@ function parseDoc(doc)
 			{
 				row.backgroundColor = "#ffffff";
 			}
-					
-			
-			
+
+
+
 				greyBg = !greyBg;
 			/*
 			 //		var media = thumbnails.item(0).getAttribute("url");
@@ -126,7 +126,7 @@ function parseDoc(doc)
 			});
 			row.add(img);
 			*/
-			
+
 			data[x++] = row;
 		}
 		catch (E)
@@ -136,17 +136,17 @@ function parseDoc(doc)
 			alert(E);
 		}
 	}
-	
+
 	var tableview = Titanium.UI.createTableView({data:data});
 	Titanium.UI.currentWindow.add(tableview);
-	
+
 	tableview.addEventListener('click',function(e)
 	{
-		
+
 		var htmlData =  e.row.htmlview;
 		htmlData = '<html><head><style>.links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:280px;max-height:200px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><h2>' + e.row.htmlTitle + '</h2>' + htmlData + '</body></html>';
 		showHTMLContent(e.row.htmlTitle,e.row.url,htmlData);
-	
+
 	});
 
 }
diff --git a/Resources/inc/seeclickfix.js b/Resources/inc/seeclickfix.js
index 794cafd..948cf2b 100644
--- a/Resources/inc/seeclickfix.js
+++ b/Resources/inc/seeclickfix.js
@@ -108,8 +108,8 @@ win.add(btnGeo);
 function searchByAddress()
 {
 	Titanium.API.info("starting address search");
-	
-	
+
+
 		var toolActInd = Titanium.UI.createActivityIndicator();
 		toolActInd.style = Titanium.UI.iPhone.ActivityIndicatorStyle.PLAIN;
 		toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
@@ -117,44 +117,44 @@ function searchByAddress()
 		toolActInd.message = 'Searching by address...';
 		win.setToolbar([toolActInd],{animated:true});
 		toolActInd.show();
-	
+
 		var valZip = txtZipcode.value;
 		var valAddress = txtAddress.value;
-		
+
 		var searchUrl = "http://nysenatemobile.appspot.com/data/senatorbyaddress.jsp?street=" + escape(valAddress) + "&zip=" + escape(valZip);
-		
+
 		Titanium.API.info("searching: " + valAddress + " " + valZip + ": " + searchUrl);
-		
+
 		var xhr = Ti.Network.createHTTPClient();
 		xhr.setTimeout(30000);
-		
+
 		xhr.onload = function()
 		{
-			
+
 			try
 			{
 				Titanium.API.info("senator lookup resp: " + this.responseText);
-				
+
 				var senatorKey = this.responseText;
 				senatorKey = senatorKey.replace(/^\s+/, '');
    				senatorKey = senatorKey.replace(/\s+$/, '');
-				
+
 				var items = getSenatorJSON ().senators;
 				var senator;
-				
+
 				for (i = 0; i < items.length; i++)
 				{
 					//Titanium.API.info("checking senator: " + items[i].key + "==" + senatorKey);
-					
+
 					if (String(items[i].key) == String(senatorKey))
 					{
 						Titanium.API.info("MATCH!");
-						
+
 						senator = items[i];
 						break;
 					}
 				}
-				
+
 				if (!senator)
 				{
 						var a = Titanium.UI.createAlertDialog({
@@ -166,9 +166,9 @@ function searchByAddress()
 				else
 				{
 					Titanium.API.info("parsed senator json");
-				
+
 					var senImage = "../../img/senators/" + senator.key + ".jpg";
-				
+
 					var newWin = Titanium.UI.createWindow({
 						url:'senator.js',
 						title:senator.name,
@@ -182,7 +182,7 @@ function searchByAddress()
 						backgroundImage:'../../img/bg/wood.jpg'
 
 					});
-						
+
 					Titanium.UI.currentTab.open(newWin,{animated:true});
 				}
 			}
@@ -191,11 +191,11 @@ function searchByAddress()
 				//alert("There was an error during lookup.");
 				alert(E);
 			}
-			
+
 					toolActInd.hide();
 					win.setToolbar(null,{animated:true});
 		};
-		
+
 		xhr.onerror = function ()
 		{
 				var a = Titanium.UI.createAlertDialog({
@@ -204,11 +204,11 @@ function searchByAddress()
 				});
 				a.show();
 		};
-		
+
 		xhr.open("GET",searchUrl);
 		xhr.send();
-	
-	
+
+
 }
 
 	var longitude = null;
@@ -219,7 +219,7 @@ function searchByAddress()
 	var speed = null;
 	var timestamp  = null;
 	var altitudeAccuracy = null;
-	
+
 		var toolActInd = Titanium.UI.createActivityIndicator();
 		toolActInd.style = Titanium.UI.iPhone.ActivityIndicatorStyle.PLAIN;
 		toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
@@ -229,11 +229,11 @@ function searchByAddress()
 
 	function handleLocation (e)
 	{
-			
+
 			toolActInd.hide();
 			win.setToolbar(null,{animated:true});
-		
-		
+
+
 			if (e.error)
 			{
 				//currentLocation.text = 'error: ' + JSON.stringify(e.error);
@@ -267,68 +267,68 @@ function searchByAddress()
 						if (places[n].street)
 						{
 							Ti.API.info("got place street: " + places[n].street);
-						
+
 							Ti.API.info("location: " + places[n].street + ", " + places[n].zipcode);
-								
+
 							txtAddress.value = places[n].street;
 							txtZipcode.value = places[n].zipcode;
-							
+
 							searchByAddress();
-							
+
 							break;
 						}
 						else if (places[n].address)
 						{
-						
+
 							Ti.API.info("got place address: " + places[n].address);
-						
+
 							var address = places[n].address;
 							//15 Warren St, New York, NY 10007, USA
-							
+
 							var addressTokens = address.split(",");
-							
+
 							var street = addressTokens[0];
 							Ti.API.info("got street: " + street);
-								
+
 							var city = trim(addressTokens[1]);
-							
+
 							Ti.API.info("got city: " + city);
-							
+
 							var stateZip = trim(addressTokens[2]).split(" ");
-							
+
 							var state = stateZip[0];
 							Ti.API.info("got state: " + state);
-							
+
 							var zipcode = stateZip[1];
 							Ti.API.info("got zip: " + zipcode);
-							
+
 							Ti.API.info("location: " + street + ", " + zipcode);
-							
+
 							txtAddress.value = street;
 							txtZipcode.value = zipcode;
-							
+
 							searchByAddress();
-							
+
 							break;
 						}
 					}
 					//txtZipcode
-					
+
 				//	searchByAddress();
 
 				});
 
 
-				
+
 	}
-	
+
 function getGeo ()
 {
-	
+
 		win.setToolbar([toolActInd],{animated:true});
 		toolActInd.show();
-		
-	
+
+
 	//
 	//  SHOW CUSTOM ALERT IF DEVICE HAS GEO TURNED OFF
 	//
@@ -338,8 +338,8 @@ function getGeo ()
 	}
 	else
 	{
-	
-	
+
+
 
 		//
 		//  SET ACCURACY - THE FOLLOWING VALUES ARE SUPPORTED
@@ -359,7 +359,7 @@ function getGeo ()
 		//
 		//Titanium.Geolocation.distanceFilter = 10;
 
-	
+
 		//
 		// GET CURRENT POSITION - THIS FIRES ONCE
 		//
@@ -374,10 +374,10 @@ function getGeo ()
 		Titanium.Geolocation.addEventListener('location',function(e)
 		{
 		//	handleLocation(e);
-		
+
 		});
 
-	
+
 	}
 
 }
@@ -385,7 +385,7 @@ function getGeo ()
 btnSearch.addEventListener('click',function()
 {
 	searchByAddress();
-	
+
 });
 
 btnGeo.addEventListener('click',function()
diff --git a/Resources/inc/youtube.js b/Resources/inc/youtube.js
index 718a40f..0cb7589 100644
--- a/Resources/inc/youtube.js
+++ b/Resources/inc/youtube.js
@@ -25,26 +25,26 @@ tableview = Titanium.UI.createTableView({
 			separatorColor:"#000000",
 			top:45
 			});
-			
+
 			Titanium.UI.currentWindow.add(tableview);
 			tableview.addEventListener('click',function(e)
 			{
-				
+
 					playYouTube(e.row.videotitle,e.row.guid);
-			
+
 			});
-			
+
 
 
 			var search = Titanium.UI.createSearchBar({
-				barColor:'#000', 
+				barColor:'#000',
 				showCancel:false,
 				hintText:'enter keywords to search',
 				height:43,
 				top:0
 			});
 
-		
+
 
 
 			//
@@ -58,18 +58,18 @@ tableview = Titanium.UI.createTableView({
 			{
 			    search.blur();
 				//search.visible = false;
-			
+
 			});
 			search.addEventListener('return', function(e)
 			{
 				var searchText = e.value;
-				
+
 			//	Titanium.UI.createAlertDialog({title:'Search Bar', message:'You typed ' + e.value }).show();
 			 	search.blur();
 			//	search.visible = false;
-				
+
 				doYouTubeSearch (DEFAULT_CHANNEL,searchText);
-				
+
 			});
 			search.addEventListener('focus', function(e)
 			{
@@ -80,7 +80,7 @@ tableview = Titanium.UI.createTableView({
 
 
 			Titanium.UI.currentWindow.add(search);
-			
+
 var xhr = Ti.Network.createHTTPClient();
 
 
@@ -88,27 +88,27 @@ function doYouTubeSearch (channel, searchTerm)
 {
 	var searchUrl = 'http://gdata.youtube.com/feeds/api/videos?alt=rss&author=' + escape(channel) + '&q=' + escape(searchTerm) + "&orderby=published&max-results=25&v=2";
 	toolActInd.show();
-	
+
 	xhr = Ti.Network.createHTTPClient();
-	
+
 
 xhr.onload = function()
 {
 	try
 	{
 			var doc;
-	
+
 	Titanium.API.debug("got youtube video response");
-	
+
 		if (!this.responseXML)
 		{
 			Titanium.API.debug("got plaintext");
-	
+
 			doc = Titanium.XML.parseString(this.responseText).documentElement;
 		}
 		else
 		{
-		
+
 			Titanium.API.debug("got XML");
 			doc = this.responseXML.documentElement;
 		}
@@ -119,7 +119,7 @@ xhr.onload = function()
 		var items = doc.getElementsByTagName("item");
 		var x = 0;
 		var c;
-		
+
 		if (items.length == 0)
 		{
 			var row = Ti.UI.createTableViewRow({height:80});
@@ -128,41 +128,41 @@ xhr.onload = function()
 			row.text = "No matching results";
 			data[x++] = row;
 		}
-		
-		
+
+
 		for (c=0;c<items.length;c++)
 		{
 			var item = items.item(c);
-		
+
 			var title = item.getElementsByTagName("title").item(0).text;
-			
+
 			var summary = "";
 			if (item.getElementsByTagName("pubDate"))
 			{
 				summary = item.getElementsByTagName("pubDate").item(0).text;
 				}
-				
+
 			var link = "";
-			
+
 			if (item.getElementsByTagName("link"))
 			{
-				link = item.getElementsByTagName("link").item(0).text;	
+				link = item.getElementsByTagName("link").item(0).text;
 			}
-			
+
 			var guid = link.substring(link.indexOf("?v=")+3);
 			guid = guid.substring(0,guid.indexOf("&"));
-			
+
 			var thumbnail = "http://i.ytimg.com/vi/" + guid + "/2.jpg";
-			
+
 			var row = Ti.UI.createTableViewRow({height:80});
-		
+
 			row.url = link;
 			row.guid = guid;
 			row.videotitle = title;
 			row.backgroundColor="#000000";
 			row.color ="#ffffff";
-			
-			
+
+
 			var labelTitle = Ti.UI.createLabel({
 				text:title,
 				left:105,
@@ -172,7 +172,7 @@ xhr.onload = function()
 				color:"#ffffff"
 			});
 			row.add(labelTitle);
-			
+
 			var labelSummary = Ti.UI.createLabel({
 				text:summary,
 				left:105,
@@ -181,7 +181,7 @@ xhr.onload = function()
 				color:"#ffffff"
 			});
 			row.add(labelSummary);
-		
+
 			var img = Ti.UI.createImageView({
 				url:thumbnail,
 				left:0,
@@ -189,92 +189,92 @@ xhr.onload = function()
 				width:100
 			});
 			row.add(img);
-			
+
 			data[x] = row;
 			tableview.appendRow(data[x]);
 
 			x++;
 		}
-		
-		
+
+
 	}
 	catch(E)
 	{
 	//	alert(E);
 		Titanium.API.debug(E);
 		Titanium.UI.createAlertDialog({title:'Video Search', message:'There was an error accessing YouTube.'}).show();
-	
+
 	}
-	
+
 		toolActInd.hide();
 };
 
 xhr.open("GET",searchUrl);
 	xhr.send();
-	
-	
+
+
 	Ti.API.debug("youtube: " + searchUrl);
 }
 
 function createWebView ()
 {
-	
+
 		webModal = Ti.UI.createWindow({
 		});
-		
+
 		webModal.orientationModes = [
 			Titanium.UI.PORTRAIT,
 			Titanium.UI.LANDSCAPE_LEFT,
 			Titanium.UI.LANDSCAPE_RIGHT
 		];
-				
-	
+
+
 		webModalView = Ti.UI.createWebView();
 		webModalView.scalesPageToFit = true;
-		
+
 		webModal.add(webModalView);
-		
+
 
 		toolActInd = Titanium.UI.createActivityIndicator();
 		toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
 		toolActInd.color = 'white';
 		toolActInd.message = 'Loading...';
-		
+
 		webModalView.addEventListener('beforeload',function(e)
 		{
 			Ti.API.debug("webview beforeload: "+e.url);
-			
+
 			toolActInd.show();
 
 		});
-			
+
 		webModalView.addEventListener('load',function(e)
 		{
 			Ti.API.debug("webview loaded: "+e.url);
-			
+
 			toolActInd.hide();
 
 		});
-	
+
 		return webModalView;
 }
 
 function showWebModal(wTitle, wUrl)
 {
 		Titanium.API.info("loading modal web view for: " + wUrl);
-		
+
 		currentLink = wUrl;
-		
+
 		createWebView();
-		
-		
+
+
 		webModal.title = wTitle;
-		
+
 		Titanium.UI.currentTab.open(webModal,{animated:true});
 		webModalView.html = null;
 		webModalView.url = wUrl;
 		webModalView.scalesPageToFit = true;
-		
+
 };
 
 function playYouTube (vtitle, vguid)
@@ -294,38 +294,38 @@ function playYouTube (vtitle, vguid)
 
 function showYouTubeVideo (wTitle, wYouTube)
 {
-	
+
 	var wYouTubeId = wYouTube.substring(wYouTube.indexOf("v=")+2);
-	
+
 	if (wYouTubeId.indexOf("&") != -1)
 	{
 		wYouTubeId = wYouTubeId.substring(0,wYouTubeId.indexOf("&"));
 	}
-	
+
 	Titanium.API.info("loading youtube page: " + wYouTubeId + " / " + wYouTube);
-	
+
 	var youTubePlayer = '<html><body><center><div id="emvideo-youtube-flash-wrapper-1"><object type="application/x-shockwave-flash" height="350" width="425" data="http://www.youtube.com/v/' + wYouTubeId + '&amp;rel=0&amp;fs=1" id="emvideo-youtube-flash-1" allowFullScreen="true"> <param name="movie" value="http://www.youtube.com/v/' + wYouTubeId + '&amp;rel=0&amp;fs=1" />  <param name="allowScriptAcess" value="sameDomain"/>  <param name="quality" value="best"/>  <param name="allowFullScreen" value="true"/>  <param name="bgcolor" value="#FFFFFF"/>  <param name="scale" value="noScale"/> <param name="salign" value="TL"/> <param name="FlashVars" value="playerMode=embedded" /> <param name="wmode" value="transparent" /> <a href="http://www.youtube.com/watch?v=' + wYouTubeId + '">	<img src="http://img.youtube.com/vi/' + wYouTubeId + '/0.jpg" width="480" height="360" alt="[Video title]" />YouTube Video</a></object></div></center></body></html>';
 
 		showHTMLContent(wTitle, '', youTubePlayer);
-	
+
 }
 
 function showHTMLContent(wTitle, wUrl, wHTMLContent)
 {
 	//Titanium.API.debug("loading html web view content: " + wHTMLContent);
-		
+
 		currentLink = wUrl;
-		
+
 		createWebView();
-		
-		
+
+
 		webModal.title = wTitle;
-		
+
 		Titanium.UI.currentTab.open(webModal,{animated:true});
-		
+
 		webModalView.html = wHTMLContent;
-		
-	
+
+
 };
 
 
diff --git a/Resources/tabs.js b/Resources/tabs.js
index ab5c95f..f9bd8ab 100644
--- a/Resources/tabs.js
+++ b/Resources/tabs.js
@@ -11,34 +11,34 @@ var tabGroup = Titanium.UI.createTabGroup({});
 //third tab
 var winSenators;
 
-winSenators = Titanium.UI.createWindow({  
+winSenators = Titanium.UI.createWindow({
 		title:'Senators',
 		url:'views/senators.js',
 	orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 });
 
 
-var tabSenators = Titanium.UI.createTab({  
+var tabSenators = Titanium.UI.createTab({
     icon:'img/icons/senators32.png',
     title:'Senators',
     window:winSenators
 });
 
 
-tabGroup.addTab(tabSenators); 
+tabGroup.addTab(tabSenators);
 
 
 
 //
 // create controls tab and root window
 //
-var winToday = Titanium.UI.createWindow({  
+var winToday = Titanium.UI.createWindow({
     title:'Calendar',
 	url:'views/today.js',
 	orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 
 });
-var tabToday = Titanium.UI.createTab({  
+var tabToday = Titanium.UI.createTab({
     icon:'img/icons/calendar32.png',
     title:'Calendar',
     window:winToday
@@ -51,13 +51,13 @@ tabGroup.addTab(tabToday);
 //
 var winHome;
 
-	winHome = Titanium.UI.createWindow({  
+	winHome = Titanium.UI.createWindow({
 	    title:'New York State Senate',
 		url:'views/newsroom.js',
 		orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 	});
 
-var tabHome = Titanium.UI.createTab({  
+var tabHome = Titanium.UI.createTab({
     icon:'img/icons/comments32.png',
     title:'Newsroom',
     window:winHome
@@ -66,33 +66,33 @@ var tabHome = Titanium.UI.createTab({
 tabGroup.addTab(tabHome);
 
 //fourth tab
-var winOpenLeg = Titanium.UI.createWindow({  
+var winOpenLeg = Titanium.UI.createWindow({
     title:'Legislation',
 	url:'views/legislation.js',
 	orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT],
 	backgroundColor:"#ffffff"
 });
-var tabOpenLeg = Titanium.UI.createTab({  
+var tabOpenLeg = Titanium.UI.createTab({
     icon:'img/icons/legislation32.png',
     title:'Legislation',
     window:winOpenLeg
 });
 
-tabGroup.addTab(tabOpenLeg); 
+tabGroup.addTab(tabOpenLeg);
 
 //fifth tab
-var winMore = Titanium.UI.createWindow({  
+var winMore = Titanium.UI.createWindow({
     title:'More',
 	url:'views/more.js',
 	orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 });
-var tabMore = Titanium.UI.createTab({  
+var tabMore = Titanium.UI.createTab({
     icon:'img/icons/more32.png',
     title:'More',
     window:winMore
 });
 
-tabGroup.addTab(tabMore); 
+tabGroup.addTab(tabMore);
 
 // open tab group with a transition animation
 tabGroup.open({
diff --git a/Resources/views/committees.js b/Resources/views/committees.js
index f396c84..b4c3cb7 100644
--- a/Resources/views/committees.js
+++ b/Resources/views/committees.js
@@ -12,14 +12,14 @@ var tableview = Titanium.UI.createTableView(tableViewOptions);
 function loadCommittees()
 {
 	var serviceCallback = function(){
-	
+
 		  // perform your code here with the data coming back,
 		  // data will be the object containing the response.
 		  //  Ti.API.debug(this.responseText);
 		  //var data = JSON.parse('{' + this.responseText + '}');
-		  
+
 		var data = JSON.parse('{"data":' + this.responseText + '}').data;
-		  
+
 		 for (i = 0; i < data["#data"].length; i++)
 		 {
 		 var nodeTitle = data["#data"][i].node_title;
@@ -35,11 +35,11 @@ function loadCommittees()
 				color:"#000000"
 			});
 			newRow.add(labelTitle);
-		   
+
 		   tableview.appendRow(newRow);
 		  }
 	};
-	
+
 	doNYSenateServiceCall('views.get',['view_name'],['committees'],serviceCallback);
 }
 
@@ -47,12 +47,12 @@ function loadCommittees()
 tableview.addEventListener('click', function(e)
 {
 	var searchValue = e.row.searchText;
-	
+
 	var win = Titanium.UI.createWindow({
 		url:'olsearch.js',
 		title:'Search: ' + searchValue
 	});
-	
+
 	win.barColor = DEFAULT_BAR_COLOR;
 	win.olterm = "committee:\"" + searchValue + "\"";
 
diff --git a/Resources/views/findsenator.js b/Resources/views/findsenator.js
index 4fcae3a..acc7ee6 100644
--- a/Resources/views/findsenator.js
+++ b/Resources/views/findsenator.js
@@ -90,63 +90,63 @@ win.add(btnGeo);
 function searchByAddress()
 {
 	Titanium.API.info("starting address search");
-	
-	
+
+
 		var toolActInd = Titanium.UI.createActivityIndicator();
 		toolActInd.style = Titanium.UI.iPhone.ActivityIndicatorStyle.PLAIN;
 		toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
 		toolActInd.color = 'white';
 		toolActInd.message = 'Searching by address...';
 		toolActInd.show();
-	
+
 		var valZip = txtZipcode.value;
 		var valAddress = txtAddress.value;
-		
+
 		var searchUrl = "http://nysenatemobile.appspot.com/data/senatorbyaddress.jsp?street=" + escape(valAddress) + "&zip=" + escape(valZip);
-		
+
 		Titanium.API.info("searching: " + valAddress + " " + valZip + ": " + searchUrl);
-		
+
 		var xhr = Ti.Network.createHTTPClient();
 		xhr.setTimeout(30000);
-		
+
 		xhr.onload = function()
 		{
-			
+
 			try
 			{
 								toolActInd.hide();
 				//Titanium.API.info("senator lookup resp: " + this.responseText);
-				
+
 				var senatorKey = this.responseText;
 				senatorKey = senatorKey.replace(/^\s+/, '');
    				senatorKey = senatorKey.replace(/\s+$/, '');
-				
+
 				var senatorItems = getSenatorJSON();
 				var senator;
-				
+
 				for (i = 0; i < senatorItems.length; i++)
 				{
 					//Titanium.API.info("checking senator: " + senatorItems[i].senator.url + "==" + senatorKey);
-					
+
 					if (senatorItems[i].senator.url.indexOf(senatorKey)!=-1)
 					{
 						Titanium.API.info("MATCH!");
-						
+
 						var imageUrl = senatorItems[i].senator.imageUrl;
-	 	
+
 						var idx = imageUrl.lastIndexOf("/");
 						imageUrl = imageUrl.substring(idx+1);
 						senatorItems[i].senator.imageFileName = imageUrl;
 						senatorItems[i].senator.imageUrl = SENATOR_THUMB_BASE + escape(imageUrl);
 						senatorItems[i].senator.imageUrlLarge = SENATOR_FULL_BASE + escape(imageUrl);
-				
+
 						senatorItems[i].senator.district = senatorItems[i].senator.district.split(' ')[3];
-					
+
 						senator = senatorItems[i].senator;
 						break;
 					}
 				}
-				
+
 				if (!senator)
 				{
 						var a = Titanium.UI.createAlertDialog({
@@ -157,9 +157,9 @@ function searchByAddress()
 				}
 				else
 				{
-				
+
 					var senImage = "../../img/senators/" + senator.key + ".jpg";
-				
+
 					var newWin = Titanium.UI.createWindow({
 						url:'senator.js',
 						title:senator.name,
@@ -171,7 +171,7 @@ function searchByAddress()
 						backgroundImage:'../img/bg/wood.jpg'
 
 					});
-						
+
 					Titanium.UI.currentTab.open(newWin,{animated:true});
 				}
 			}
@@ -181,10 +181,10 @@ function searchByAddress()
 				alert("There was an error finding your location.");
 				debug(E);
 			}
-			
-					
+
+
 		};
-		
+
 		xhr.onerror = function ()
 		{
 
@@ -195,11 +195,11 @@ function searchByAddress()
 				});
 				a.show();
 		};
-		
+
 		xhr.open("GET",searchUrl);
 		xhr.send();
-	
-	
+
+
 }
 
 	var longitude = null;
@@ -210,7 +210,7 @@ function searchByAddress()
 	var speed = null;
 	var timestamp  = null;
 	var altitudeAccuracy = null;
-	
+
 		var toolActInd = Titanium.UI.createActivityIndicator();
 		toolActInd.style = Titanium.UI.iPhone.ActivityIndicatorStyle.PLAIN;
 		toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
@@ -218,13 +218,13 @@ function searchByAddress()
 		toolActInd.message = 'Finding your location...';
 
 		var locationFound = false;
-		
+
 	function handleLocation (e)
 	{
-			
+
 			toolActInd.hide();
-		
-		
+
+
 			if (e.error)
 			{
 				//currentLocation.text = 'error: ' + JSON.stringify(e.error);
@@ -267,14 +267,14 @@ function searchByAddress()
 				Ti.API.info('>ADR found:'+ gotitems.results[0].formatted_address);
 				adrlabel.text=gotitems.results[0].formatted_address;
 				*/
-		 
+
 			}
-			xhrgeo.send(); 
-			
-				
+			xhrgeo.send();
+
+
+
 
 
-				
 	}
 
 // reverse geo
@@ -291,49 +291,49 @@ function searchByAddress()
 						if (places[n].types[0] == "street_address")
 						{
 							Ti.API.info("got address: " + places[n].formatted_address);
-						
+
 							for (i = 0; i < places[n].address_components.length; i++)
 							{
 								if (places[n].address_components[i].types[0] == "postal_code")
 								{
-								
+
 										txtZipcode.value = places[n].address_components[i].short_name;
 
 								}
 								else if (places[n].address_components[i].types[0] == "street_number")
 								{
-								
+
 										txtAddress.value = places[n].address_components[i].short_name;
 
 								}
 								else if (places[n].address_components[i].types[0] == "route")
 								{
-								
+
 										txtAddress.value += ' ' + places[n].address_components[i].short_name;
 
 								}
-								
-								
-							
+
+
+
 							}
 							searchByAddress();
-							
+
 							break;
 						}
-					
+
 					}
 					//txtZipcode
-					
+
 				//	searchByAddress();
 
 				}
-				
+
 function getGeo ()
 {
-	
+
 		toolActInd.show();
-		
-	
+
+
 	//
 	//  SHOW CUSTOM ALERT IF DEVICE HAS GEO TURNED OFF
 	//
@@ -343,8 +343,8 @@ function getGeo ()
 	}
 	else
 	{
-	
-	
+
+
 
 		//
 		//  SET ACCURACY - THE FOLLOWING VALUES ARE SUPPORTED
@@ -365,8 +365,8 @@ function getGeo ()
 		//
 		//Titanium.Geolocation.distanceFilter = 5;
 
-	
-		
+
+
 		//
 		// EVENT LISTENER FOR GEO EVENTS - THIS WILL FIRE REPEATEDLY (BASED ON DISTANCE FILTER)
 		//
@@ -376,8 +376,8 @@ function getGeo ()
 		{
 			if (!locationFound)
 				handleLocation(e);
-		
-		});*/		
+
+		});*/
 
 //
 		// GET CURRENT POSITION - THIS FIRES ONCE
@@ -389,7 +389,7 @@ function getGeo ()
 
 
 
-	
+
 	}
 
 }
@@ -397,7 +397,7 @@ function getGeo ()
 btnSearch.addEventListener('click',function()
 {
 	searchByAddress();
-	
+
 });
 
 btnGeo.addEventListener('click',function()
diff --git a/Resources/views/homemenu.js b/Resources/views/homemenu.js
index 0429775..9fd3a82 100644
--- a/Resources/views/homemenu.js
+++ b/Resources/views/homemenu.js
@@ -18,8 +18,8 @@ backgroundColor:"#ffffff"
 
 for (var c = 0; c < data.length; c++)
 {
-	
-	
+
+
 	row = Ti.UI.createTableViewRow({height:60});
 	row.className = 'morerow';
 	row.color = '#333333';
@@ -30,12 +30,12 @@ for (var c = 0; c < data.length; c++)
 	row.oltype = data[c].oltype;
 	row.hasDetail = true;
 	row.leftImage = data[c].icon;
-		
+
 	row.title = data[c].title;
-	
+
 	tableview.appendRow(row);
-		
-	
+
+
 }
 
 
@@ -47,17 +47,17 @@ tableview.addEventListener('click', function(e)
 	if (e.rowData.tab)
 	{
 		//Titanium.UI.currentTab.setActiveTab(e.rowData.tab);
-	}	
+	}
 	else if (e.rowData.ilink)
 	{
 		subWin = Titanium.UI.createWindow({
 			url:e.rowData.ilink,
 			title:e.rowData.pageTitle
-			
+
 		});
 
 		subWin.channel = e.rowData.channel;
-			
+
 		subWin.barColor = DEFAULT_BAR_COLOR;
 		Ti.UI.currentTab.open(subWin,{animated:true});
 	}
diff --git a/Resources/views/homeslider.js b/Resources/views/homeslider.js
index f67accd..9f6dadf 100644
--- a/Resources/views/homeslider.js
+++ b/Resources/views/homeslider.js
@@ -33,7 +33,7 @@ var toolActInd = Titanium.UI.createActivityIndicator({
   	  height:50,
   	  width:10
 	});
-	
+
 	toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
 	toolActInd.color = 'white';
 	toolActInd.message = 'Connecting to the Senate...';
@@ -53,13 +53,13 @@ function loadFeeds ()
 	feedViews = [];
 	feedXhr = [];
 	thisXhr = null;
-	
+
 	if (scrollViewMain)
 	{
 		win.remove(scrollViewMain);
 		scrollViewMain = null;
 	}
-	
+
 	scrollViewMain = Titanium.UI.createScrollView({
 		top:0,
 		left:0,
@@ -73,10 +73,10 @@ function loadFeeds ()
 	win.add(scrollViewMain);
 
 	toolActInd.show();
-	
+
 	for (i = 0; i < feeds.length; i++)
 	{
-		
+
 		var labelTitle = Ti.UI.createLabel({
 			text:feeds[i][0],
 			left:0,
@@ -85,9 +85,9 @@ function loadFeeds ()
 			font:{fontSize:14},
 			color:'#ffffff'
 		});
-		
+
 		scrollViewMain.add(labelTitle);
-		
+
 		var scrollViewRow = Titanium.UI.createScrollView({
 					top:currentTop+20,
 					left:0,
@@ -97,11 +97,11 @@ function loadFeeds ()
 					showVerticalScrollIndicator:false,
 					showHorizontalScrollIndicator:true,
 					scrollType:'horizontal'
-			
+
 		});
-		
+
 		feedViews[feedViews.length] = scrollViewRow;
-	
+
 		loadFeed(feeds[i][1],feeds[i][2],i);
 		currentTop += rowHeight;
 	}
@@ -114,11 +114,11 @@ var errorHandler = function ()
 			title:'Network Error',
 			message:'Unable to connect to NYSenate.gov.\nPlease try again later.',
 			 buttonNames: ['OK']
-			
+
 		});
-		
+
 		alertOff.show();
-	
+
 };
 
 
@@ -133,23 +133,23 @@ function parseDoc(doc, feedIdx)
 	//Titanium.API.debug("viewing items: " + items.length);
 
 	var greyBg = false;
-	
+
 	var x = 0;
 	var c;
-	
+
 	var rTop = 10;
-	
+
 	var vWidth = 160;
 	var vHeight = 120;
 	var vHorizSpacing = 30;
-	
+
 	if (screenWidth < 768)
 		vHorizSpacing = 5;
-	
+
 	var rLeft = 0;
 	var vContainerHeight = 200;
 	var vLabelHeight = 70;
-		
+
 	var scrollViewRss = feedViews[feedIdx];
 	var title = "";
 	var link = "";
@@ -161,7 +161,7 @@ function parseDoc(doc, feedIdx)
 		try
 		{
 			item = items.item(c);
-		
+
 			title = item.getElementsByTagName("title");
 
 			if (title && title.item)
@@ -172,17 +172,17 @@ function parseDoc(doc, feedIdx)
 			//Ti.API.info(c + ": " + title);
 
 			link = item.getElementsByTagName("link");
-			if (link && link.item)			
+			if (link && link.item)
 				link = link.item(0).text;
 			else
-				link = "";			
-	
+				link = "";
+
 			//Ti.API.info(c + ": " + link);
 
 			dateString = item.getElementsByTagName("pubDate");
-			
 
-			if (dateString && dateString.item)	
+
+			if (dateString && dateString.item)
 				dateString = new Date(dateString.item(0).text).format('M jS');
 			else
 				dateString = "";
@@ -193,20 +193,20 @@ function parseDoc(doc, feedIdx)
 			if (desc && desc.item(0))
 				desc = desc.item(0).text;
 			else
-				desc = "";			
-						
+				desc = "";
+
 		//	Ti.API.info(c + ": desc length " + desc.length);
 
 			var thumbnail = "";
-			
+
 			var mediaThumbnail = item.getElementsByTagName("media:thumbnail");
-			
+
 			if (mediaThumbnail && mediaThumbnail.item && mediaThumbnail.item.length > 0)
 			{
 				Ti.API.info("got media:thumbnail");
 				mediaThumbnail = mediaThumbnail.item(0);
 				thumbnail = mediaThumbnail.getAttribute("url");
-		
+
 			}
 			else
 			{
@@ -222,10 +222,10 @@ function parseDoc(doc, feedIdx)
 						{
 							Ti.API.debug("found match: " + descImages[dIdx]);
 							thumbnail = descImages[dIdx];
-		
+
 						}
 					}
-	
+
 					Ti.API.info(c + ': ' + thumbnail);
 
 				}
@@ -236,9 +236,9 @@ function parseDoc(doc, feedIdx)
 					Titanium.API.error(err);
 				}
 			}
-			
-			
-			
+
+
+
 			var videoBox = Titanium.UI.createView({
 				height:vHeight,
 				width:vWidth,
@@ -246,9 +246,9 @@ function parseDoc(doc, feedIdx)
 				left:rLeft,
 				backgroundColor:"#000000"
 			});
-			
+
 			rLeft+=vWidth+6;
-			
+
 			var labelBottom = 80;
 			var labelHeight = 40;
 			var img;
@@ -257,20 +257,20 @@ function parseDoc(doc, feedIdx)
 
 			if (thumbnail)
 			{
-			
+
 				Ti.API.info("setting thumbnail: " + thumbnail);
 
 				thumbnail = thumbnail.replace("files/", "files/imagecache/teaser_featured_image/");
 
-				/*					
+				/*
 				var cachedImage = getCachedFile(thumbnail);
-			
+
 				if (!cachedImage)
 				{
 					cacheFile(thumbnail);
 					cachedImage = thumbnail;
 				}*/
-				
+
 				img = Ti.UI.createImageView({
 					//image:cachedImage,
 					url:thumbnail,
@@ -279,10 +279,10 @@ function parseDoc(doc, feedIdx)
 					height:vHeight,
 					width:vWidth
 				});
-				
+
 				videoBox.add(img);
-				
-			}			
+
+			}
 			else
 			{
 
@@ -292,9 +292,9 @@ function parseDoc(doc, feedIdx)
 				labelHeight = 120;
 				labelFontSize = 16;
 			//	Ti.API.info("setting title: " + labelTitle);
-				
+
 			}
-			
+
 			var labelTitle = Ti.UI.createLabel({
 				text:labelTitle,
 				left:0,
@@ -307,40 +307,40 @@ function parseDoc(doc, feedIdx)
 				opacity:.7
 			});
 			videoBox.add(labelTitle);
-			
+
 			if (thumbnail)
 			{
 				img.blogContent = desc;
 				img.blogTitle = title;
 				img.blogLink = link;
-				
+
 				img.addEventListener('singletap',function(e)
 				{
-					
+
 					var htmlData =  e.source.blogContent;
 						htmlData = '<html><head><style>.links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:280px;max-height:200px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><h2>' + e.source.blogTitle + '</h2>' + htmlData + '</body></html>';
 						showHTMLContent(e.source.blogTitle,e.source.blogLink,htmlData);
-				
+
 				});
 			}
 			else
 			{
 				labelTitle.left = 3;
-				
+
 				labelTitle.blogContent = desc;
 				labelTitle.blogTitle = title;
 				labelTitle.blogLink = link;
-				
+
 				labelTitle.addEventListener('singletap',function(e)
 				{
-					
+
 					var htmlData =  e.source.blogContent;
 						htmlData = '<html><head><style>.links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:280px;max-height:200px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><h2>' + e.source.blogTitle + '</h2>' + htmlData + '</body></html>';
 						showHTMLContent(e.source.blogTitle,e.source.blogLink,htmlData);
-				
+
 				});
 			}
-			
+
 			scrollViewRss.add(videoBox);
 		}
 		catch (err)
@@ -366,71 +366,71 @@ function parseYoutube (respObj)
 			toolActInd.hide();
 
 		var doc;
-	
+
 		//Titanium.API.debug("got youtube video response");
-	
+
 		if (!respObj.responseXML)
 		{
 		//	Titanium.API.debug("got plaintext");
-	
+
 			doc = Titanium.XML.parseString(respObj.responseText).documentElement;
 		}
 		else
 		{
-		
+
 		//	Titanium.API.debug("got XML");
 			doc = respObj.responseXML.documentElement;
 		}
-		
+
 		var scrollViewVideos = feedViews[respObj.feedIdx];
 
 		var items = doc.getElementsByTagName("item");
-		
+
 		var c;
-		
-		
+
+
 		var x = 0;
 		var rTop = 10;
-		
+
 		var vWidth = 160;
 		var vHeight = 120;
 		var vHorizSpacing = 30;
-		
+
 		if (screenWidth < 768)
 			vHorizSpacing = 5;
-		
+
 		var rLeft = 0;
 		var vContainerHeight = 200;
 		var vLabelHeight = 70;
-		
 
-				
+
+
 		for (c=0;c<items.length;c++)
 		{
 			var item = items.item(c);
-		
+
 			var title = item.getElementsByTagName("title").item(0).text;
-			
+
 			var summary = "";
 			if (item.getElementsByTagName("pubDate"))
 			{
 				summary = item.getElementsByTagName("pubDate").item(0).text;
 			}
-				
+
 			var link = "";
-			
+
 			if (item.getElementsByTagName("link"))
 			{
-				link = item.getElementsByTagName("link").item(0).text;	
+				link = item.getElementsByTagName("link").item(0).text;
 			}
-			
-			
+
+
 			var guid = link.substring(link.indexOf("?v=")+3);
 			guid = guid.substring(0,guid.indexOf("&"));
-			
+
 			var thumbnail = "http://i.ytimg.com/vi/" + guid + "/2.jpg";
-			
-				
+
+
 			var videoBox = Titanium.UI.createView({
 				height:vHeight,
 				width:vWidth,
@@ -440,18 +440,18 @@ function parseYoutube (respObj)
 				backgroundColor:"#000000"
 			});
 
-		
+
 			rLeft+=vWidth+6;
 
 			/*
 			var cachedImage = getCachedFile(thumbnail);
-			
+
 			if (!cachedImage)
 			{
 				cacheFile(thumbnail);
 				cachedImage = thumbnail;
 			}*/
-			
+
 			var img = Ti.UI.createImageView({
 				//image:cachedImage,
 				url:thumbnail,
@@ -460,14 +460,14 @@ function parseYoutube (respObj)
 				height:vHeight,
 				width:vWidth
 			});
-			
+
 			img.guid = guid;
 			img.videotitle = title;
 
 			videoBox.add(img);
 
-						
-			
+
+
 			var labelTitle = Ti.UI.createLabel({
 				text:title,
 				left:0,
@@ -479,23 +479,23 @@ function parseYoutube (respObj)
 				opacity:.7
 			});
 			videoBox.add(labelTitle);
-			
-			
+
+
 			img.addEventListener('singletap',function(e)
 			{
-				
+
 					playYouTube(e.source.videotitle,e.source.guid);
-			
+
 			});
-			
+
 			scrollViewVideos.add(videoBox);
-	
-			
+
+
 		}
-		
+
 		scrollViewMain.add(scrollViewVideos);
 
-		
+
 	}
 	catch(E)
 	{
@@ -503,30 +503,30 @@ function parseYoutube (respObj)
 		Titanium.API.debug(E);
 		Titanium.UI.createAlertDialog({title:'NY Senate', message:'No videos were found for this search.'}).show();
 	}
-	
+
 }
 
 function parseNewsroomResponse (responseText, feedIdx)
 {
 	var items = JSON.parse('{"data":' + responseText + '}').data["#data"];
-	
-	
+
+
 	var x = 0;
 	var c;
-	
+
 	var rTop = 10;
-	
+
 	var vWidth = 160;
 	var vHeight = 120;
 	var vHorizSpacing = 30;
-	
+
 	if (screenWidth < 768)
 		vHorizSpacing = 5;
-	
+
 	var rLeft = 0;
 	var vContainerHeight = 200;
 	var vLabelHeight = 70;
-		
+
 	var scrollViewRss = feedViews[feedIdx];
 	var title = "";
 	var link = "";
@@ -535,37 +535,37 @@ function parseNewsroomResponse (responseText, feedIdx)
 
 	for (i = 0; i < items.length; i++)
 	 {
-		
+
 		try
 		{
 			item = items[i];
-		
+
 			title = item.title;
 
 			link = "http://nysenate.gov/" + item.path;
 
 			/*
 			dateString = item.getElementsByTagName("pubDate");
-			
-			if (dateString && dateString.item)	
+
+			if (dateString && dateString.item)
 				dateString = new Date(dateString.item(0).text).format('M jS');
 			else
 				dateString = "";
 				*/
 
-			desc = item.body;	
-						
+			desc = item.body;
+
 			var thumbnail = "";
-			
+
 			var isVideo = false;
-			
+
 			if (item.field_video && item.field_video.length > 0 && item.field_video[0].data.thumbnail)
 			{
 				thumbnail = item.field_video[0].data.thumbnail.url;
-				
+
 				//link = item.field_video[0].embed;
 				link = item.field_video[0].value;
-				
+
 				isVideo = true;
 			}
 			else
@@ -582,10 +582,10 @@ function parseNewsroomResponse (responseText, feedIdx)
 						{
 							Ti.API.debug("found match: " + descImages[dIdx]);
 							thumbnail = descImages[dIdx];
-		
+
 						}
 					}
-	
+
 					//Ti.API.info(c + ': ' + thumbnail);
 
 				}
@@ -596,9 +596,9 @@ function parseNewsroomResponse (responseText, feedIdx)
 					Titanium.API.error(err);
 				}
 			}
-			
-			
-			
+
+
+
 			var videoBox = Titanium.UI.createView({
 				height:vHeight,
 				width:vWidth,
@@ -606,9 +606,9 @@ function parseNewsroomResponse (responseText, feedIdx)
 				left:rLeft,
 				backgroundColor:"#000000"
 			});
-			
+
 			rLeft+=vWidth+6;
-			
+
 			var labelBottom = 80;
 			var labelHeight = 40;
 			var img;
@@ -617,21 +617,21 @@ function parseNewsroomResponse (responseText, feedIdx)
 
 			if (thumbnail)
 			{
-			
+
 			//	Ti.API.info("setting thumbnail: " + thumbnail);
-	
+
 				if( thumbnail.indexOf("nysenate.gov")!=-1)
 					thumbnail = thumbnail.replace("files/", "files/imagecache/teaser_featured_image/");
 
-				/*					
+				/*
 				var cachedImage = getCachedFile(thumbnail);
-			
+
 				if (!cachedImage)
 				{
 					cacheFile(thumbnail);
 					cachedImage = thumbnail;
 				}*/
-				
+
 				img = Ti.UI.createImageView({
 					//image:cachedImage,
 					url:thumbnail,
@@ -640,10 +640,10 @@ function parseNewsroomResponse (responseText, feedIdx)
 					height:vHeight,
 					width:vWidth
 				});
-				
+
 				videoBox.add(img);
-				
-			}			
+
+			}
 			else
 			{
 
@@ -653,9 +653,9 @@ function parseNewsroomResponse (responseText, feedIdx)
 				labelHeight = 120;
 				labelFontSize = 16;
 			//	Ti.API.info("setting title: " + labelTitle);
-				
+
 			}
-			
+
 			var labelTitle = Ti.UI.createLabel({
 				text:labelTitle,
 				left:0,
@@ -668,13 +668,13 @@ function parseNewsroomResponse (responseText, feedIdx)
 				opacity:.7
 			});
 			videoBox.add(labelTitle);
-			
+
 			if (thumbnail)
 			{
 				img.blogContent = desc;
 				img.blogTitle = title;
 				img.blogLink = link;
-				
+
 				if (isVideo)
 				{
 					img.addEventListener('singletap',function(e)
@@ -686,32 +686,32 @@ function parseNewsroomResponse (responseText, feedIdx)
 				{
 					img.addEventListener('singletap',function(e)
 					{
-						
+
 						var htmlData =  e.source.blogContent;
 							htmlData = '<html><head><style>.links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:280px;max-height:200px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><h2>' + e.source.blogTitle + '</h2>' + htmlData + '</body></html>';
 							showHTMLContent(e.source.blogTitle,e.source.blogLink,htmlData);
-					
+
 					});
 				}
 			}
 			else
 			{
 				labelTitle.left = 3;
-				
+
 				labelTitle.blogContent = desc;
 				labelTitle.blogTitle = title;
 				labelTitle.blogLink = link;
-				
+
 				labelTitle.addEventListener('singletap',function(e)
 				{
-					
+
 					var htmlData =  e.source.blogContent;
 						htmlData = '<html><head><style>.links, .share_links { display: none;} body {font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:280px;max-height:200px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><h2>' + e.source.blogTitle + '</h2>' + htmlData + '</body></html>';
 						showHTMLContent(e.source.blogTitle,e.source.blogLink,htmlData);
-				
+
 				});
 			}
-			
+
 			scrollViewRss.add(videoBox);
 		}
 		catch (err)
@@ -724,106 +724,106 @@ function parseNewsroomResponse (responseText, feedIdx)
 
 	scrollViewMain.add(scrollViewRss);
 
-	  
-	
+
+
 }
 
 
 
 function loadFeed (type, value, feedIdx)
 {
-	
-	
+
+
 	thisXhr =  Ti.Network.createHTTPClient();
 	thisXhr.feedIdx = feedIdx;
-	
+
 	if (type == 'rss')
 	{
 		var rssUrl = value;
-		
-			
+
+
 		thisXhr.onload = function ()
 		{
 			if(toolActInd)
 				toolActInd.hide();
-				
+
 		//	Titanium.API.debug("got rss response");
 			cacheFile(this.location, this.responseText);
-				
+
 			var doc = Titanium.XML.parseString(this.responseText).documentElement;
-			
+
 			parseDoc(doc, this.feedIdx);
-			
+
 		};
-		
+
 		thisXhr.onerror = errorHandler;
-		
+
 		thisXhr.open("GET",rssUrl);
 		thisXhr.send();
-	
+
 	//	Ti.API.debug('fetching rss: ' + rssUrl);
 	}
 	else if (type == 'youtube')
 	{
 		var searchTerm = '';
 		var channel = value;
-		var searchUrl = 'http://gdata.youtube.com/feeds/api/videos?alt=rss&author=' + escape(channel) + '&q=' + escape(searchTerm) + "&orderby=published&max-results=10&v=2";	
-		
+		var searchUrl = 'http://gdata.youtube.com/feeds/api/videos?alt=rss&author=' + escape(channel) + '&q=' + escape(searchTerm) + "&orderby=published&max-results=10&v=2";
+
 		thisXhr.onload = function ()
 		{
 			if(toolActInd)
 				toolActInd.hide();
-				
+
 			//cacheFile(this.location, this.responseText);
 			parseYoutube(this);
 		};
 		thisXhr.onerror = errorHandler;
-		
+
 		thisXhr.open("GET",searchUrl);
 		thisXhr.send();
-		
+
 		Ti.API.debug('fetching youtube: ' + searchUrl);
-	
+
 	}
 	else if (type == 'views')
 	{
-			
-			
+
+
 			var serviceCallback = function(){
 				cacheFile('view.' + value, this.responseText);
 				parseNewsroomResponse(this.responseText, feedIdx);
 			};
-	
+
 			doNYSenateServiceCall('views.get',['view_name'],[value],serviceCallback, function ()
 			{
-					
+
 					var viewRespText = getCachedFile('view.' + value);
-					
+
 					if (viewRespText)
 					{
 						Ti.API.info("GOT CACHED VIEW:" + value);
 						parseNewsroomResponse(viewRespText, feedIdx);
 					}
-			
+
 			});
 	}
-	
+
 	feedXhr[feedIdx] = thisXhr;
 }
 
 function checkOnline (onlineState)
 {
-	
-	
+
+
 	if (!onlineState)
 	{
 		var alertOff = Titanium.UI.createAlertDialog({
 			title:'No Network',
 			message:'You are offline.\nSome content may be inaccessible.',
 			 buttonNames: ['OK']
-			
+
 		});
-		
+
 		alertOff.show();
 	}
 	else
@@ -835,15 +835,15 @@ function checkOnline (onlineState)
 
 if (Titanium.Platform.name == 'iPhone OS')
 {
-	
+
 	var btnRefresh = Titanium.UI.createButton({
 		image:'../img/btn/icon_refresh.png',
 		style:Titanium.UI.iPhone.SystemButtonStyle.PLAIN
 	});
-	
-	
+
+
 	win.rightNavButton = btnRefresh;
-	
+
 	btnRefresh.addEventListener('click',function()
 	{
 		//no worries!
@@ -857,14 +857,14 @@ else
 
 	var tb1 = null;
 var tb2 = null;
- 
+
 var menuHandler = function() {
     tb1.addEventListener('click', function() {
        //no worries!
 		loadFeeds();
     });
 };
- 
+
 var activity = Ti.Android.currentActivity;
 activity.onCreateOptionsMenu = function(e) {
     var menu = e.menu;
@@ -883,30 +883,30 @@ function reloadLayout()
 {
 	screenHeight = win.size.height;
 	screenWidth = win.size.width;
-	
+
 	scrollViewMain.width = screenWidth;
 	scrollViewMain.contentWidth = 'auto';
 	scrollViewMain.contentHeight = 'auto';
-	
+
 	for (i = 0; i < feedViews.length; i++)
 	{
 		feedViews[i].width = screenWidth;
 		feedViews[i].contentWidth = 'auto';
 		feedViews[i].contentHeight = 'auto';
-	
+
 	}
 }
 
-Titanium.Gesture.addEventListener('orientationchange',function(e){        
+Titanium.Gesture.addEventListener('orientationchange',function(e){
 
 	Ti.API.debug(e.orientation);
-	
-	
+
+
 	if (lastOrientation != e.orientation)
 	{
 		 if(e.orientation == 1 || e.orientation == 2)
 		{
-			// Function that changes the left property of 
+			// Function that changes the left property of
 			// just about every item in the view
 				reloadLayout();
 		}
@@ -914,10 +914,10 @@ Titanium.Gesture.addEventListener('orientationchange',function(e){
 		{
 				reloadLayout();
 		}
-		
-    
+
+
  	}
- 	
+
  	lastOrientation =  Math.round(e.orientation);
 });
 
diff --git a/Resources/views/legislation.js b/Resources/views/legislation.js
index 2c7c51e..a27b33e 100644
--- a/Resources/views/legislation.js
+++ b/Resources/views/legislation.js
@@ -22,7 +22,7 @@ data.push({title:'Calendars & Active Lists', summary:'Bills scheduled for the Se
 data.push({title:'Recent Votes', summary:'Floor and Committee Vote Records',link:'olsearch.js', oltype:'vote'});
 data.push({title:'Transcripts', summary:'Senate Session and Hearing Transcripts', link:'olsearch.js', oltype:'transcript'});
 data.push({title:'By Committee', summary:'Browse Legislation by Committee', link:'committees.js'});
-	
+
 
 
 // create table view
@@ -32,22 +32,22 @@ var tableview = Titanium.UI.createTableView({
 	left:0,
 	separatorColor:"#cccccc",
 	backgroundImage:'../img/bg/bglight.jpg'
-		
+
 });
 
 for (var c = 0; c < data.length; c++)
 {
-	
-	
+
+
 	row = Ti.UI.createTableViewRow({height:60});
 	row.className = 'legrow';
 	row.pageTitle = data[c].title;
 	row.link =  data[c].link;
 	row.oltype = data[c].oltype;
 	row.hasDetail = true;
-	
-	
-		
+
+
+
 	var labelTitle = Ti.UI.createLabel({
 		text:data[c].title,
 		left:6,
@@ -57,7 +57,7 @@ for (var c = 0; c < data.length; c++)
 		color:'#333333'
 	});
 	row.add(labelTitle);
-	
+
 	var labelTime = Ti.UI.createLabel({
 		text:data[c].summary,
 		left:6,
@@ -66,12 +66,12 @@ for (var c = 0; c < data.length; c++)
 		color:'#555555'
 	});
 	row.add(labelTime);
-			
 
-	
+
+
 	tableview.appendRow(row);
-		
-	
+
+
 }
 
 // create table view event listener
@@ -84,13 +84,13 @@ tableview.addEventListener('click', function(e)
 			title:e.rowData.pageTitle,
 			orientationModes:[Titanium.UI.LANDSCAPE_LEFT,Titanium.UI.LANDSCAPE_RIGHT,Titanium.UI.PORTRAIT]
 		});
-		
-		
+
+
 		if (e.rowData.oltype)
 		{
 			win.oltype = e.rowData.oltype;
 		}
-		
+
 		Titanium.UI.currentTab.open(win,{animated:true});
 	}
 	else if (e.rowData.dosearch)
@@ -106,7 +106,7 @@ tableview.addEventListener('click', function(e)
 
 	var search = Titanium.UI.createSearchBar({
 		barColor:'#333333',
-		hintText:'enter search keywords', 
+		hintText:'enter search keywords',
 		showCancel:true,
 		height:43,
 		top:2,
@@ -114,19 +114,19 @@ tableview.addEventListener('click', function(e)
 	});
 
 
-	
+
 if (Titanium.Platform.name == 'iPhone OS')
 {
-	
+
 	var btnSearch = Titanium.UI.createButton({
 		title:'Search',
 		style:Titanium.UI.iPhone.SystemButtonStyle.PLAIN
 	});
-	
-	
-	
+
+
+
 	Titanium.UI.currentWindow.rightNavButton = btnSearch;
-	
+
 	btnSearch.addEventListener('click',function()
 	{
 		search.visible = true;
@@ -140,14 +140,14 @@ else
 
 	var tb1 = null;
 var tb2 = null;
- 
+
 var menuHandler = function() {
     tb1.addEventListener('click', function() {
         search.visible = true;
 		tableview.top = 45;
     });
 };
- 
+
 var activity = Ti.Android.currentActivity;
 activity.onCreateOptionsMenu = function(e) {
     var menu = e.menu;
@@ -165,7 +165,7 @@ activity.onCreateOptionsMenu = function(e) {
 search.addEventListener('change', function(e)
 {
 //	Titanium.API.info('search bar: you type ' + e.value + ' act val ' + search.value);
-	
+
 });
 search.addEventListener('cancel', function(e)
 {
@@ -177,18 +177,18 @@ search.addEventListener('cancel', function(e)
 search.addEventListener('return', function(e)
 {
 //	Titanium.UI.createAlertDialog({title:'Search Bar', message:'You typed ' + e.value }).show();
-	
+
 	var win = Titanium.UI.createWindow({
 		url:'olsearch.js',
 		title:'Search: ' + search.value
 	});
-	
+
 	win.barColor = DEFAULT_BAR_COLOR;
 	win.olterm = search.value;
 
 	Titanium.UI.currentTab.open(win,{animated:true});
-	
-	
+
+
 });
 search.addEventListener('focus', function(e)
 {
diff --git a/Resources/views/more.js b/Resources/views/more.js
index 8b5720d..3e26fd9 100644
--- a/Resources/views/more.js
+++ b/Resources/views/more.js
@@ -22,8 +22,8 @@ backgroundColor:"#ffffff"
 
 for (var c = 0; c < data.length; c++)
 {
-	
-	
+
+
 	row = Ti.UI.createTableViewRow({height:60});
 	row.className = 'morerow';
 	row.pageTitle = data[c].title;
@@ -33,7 +33,7 @@ for (var c = 0; c < data.length; c++)
 	row.oltype = data[c].oltype;
 	row.hasDetail = true;
 
-		
+
 	var labelTitle = Ti.UI.createLabel({
 		text:data[c].title,
 		left:10,
@@ -43,7 +43,7 @@ for (var c = 0; c < data.length; c++)
 		color:'#000'
 	});
 	row.add(labelTitle);
-	
+
 	var labelTime = Ti.UI.createLabel({
 		text:data[c].summary,
 		left:10,
@@ -52,12 +52,12 @@ for (var c = 0; c < data.length; c++)
 		color:'#333'
 	});
 	row.add(labelTime);
-			
 
-	
+
+
 	tableview.appendRow(row);
-		
-	
+
+
 }
 
 
@@ -66,17 +66,17 @@ var subWin;
 // create table view event listener
 tableview.addEventListener('click', function(e)
 {
-	
+
 	if (e.rowData.ilink)
 	{
 			subWin = Titanium.UI.createWindow({
 				url:e.rowData.ilink,
 				title:e.rowData.pageTitle
-				
+
 			});
 
 			subWin.channel = e.rowData.channel;
-				
+
 			subWin.barColor = DEFAULT_BAR_COLOR;
 			Titanium.UI.currentTab.open(subWin,{animated:true});
 	}
diff --git a/Resources/views/newsroom.js b/Resources/views/newsroom.js
index 054bf64..2b719c0 100644
--- a/Resources/views/newsroom.js
+++ b/Resources/views/newsroom.js
@@ -6,7 +6,7 @@ var urlRegex = new RegExp("http:\\/\\/\\S+\\.[jJ][pP][eE]?[gG]", "g");
 //var urlRegex = new RegExp("((?:(?:https?|ftp|file)://|www.|ftp.)[-A-Z0-9+&@#/%=~|$?!:,.][A-Z0-9+&@#/%=~_|$]+.(jpg|png|gif|jpeg|bmp))(?!([^<]+)?>)");
 var win = Ti.UI.currentWindow;
 var newsTable = Titanium.UI.createTableView({
-	
+
 backgroundColor:"#ffffff"
 });
 var newsItems = [];
@@ -16,14 +16,14 @@ win.add(newsTable);
 
 function loadTheNews()
 {
-	
+
 	showLoadingDialog("Loading","Loading News...");
 	var serviceCallback = function(){
 		parseNewsroomResponse(this.responseText);
 	};
-	
+
 	doNYSenateServiceCall('views.get',['view_name'],['senate_updates'],serviceCallback);
-	
+
 }
 
 function parseNewsroomResponse (responseText)
@@ -34,10 +34,10 @@ function parseNewsroomResponse (responseText)
 	newsItems = [];
 
 	//Ti.API.info(responseText);
-		
+
 	var data = JSON.parse('{"data":' + responseText + '}').data;
 
-	
+
 
 	 for (i = 0; i < data["#data"].length; i++)
 	 {
@@ -47,15 +47,15 @@ function parseNewsroomResponse (responseText)
 		newsItems[i].body = item.body;
 		newsItems[i].link = "http://nysenate.gov/" + item.path;
 
-		
-			
+
+
 			if (item.field_video && item.field_video.length > 0 && item.field_video[0].data.thumbnail)
 			{
 				newsItems[i].thumbnail = item.field_video[0].data.thumbnail.url;
-				
+
 				//link = item.field_video[0].embed;
 				link = item.field_video[0].value;
-				
+
 			}
 			else
 			{
@@ -71,10 +71,10 @@ function parseNewsroomResponse (responseText)
 						{
 							//Ti.API.debug("found match: " + descImages[dIdx]);
 							newsItems[i].thumbnail = descImages[dIdx];
-		
+
 						}
 					}
-	
+
 
 				}
 				catch (err)
@@ -82,31 +82,31 @@ function parseNewsroomResponse (responseText)
 
 					Titanium.API.error(err);
 				}
-			}		
+			}
+
 
-	
 		var row = addRow (newsItems[i]);
 		newsTable.appendRow(row);
 	}
 
 	newsTable.addEventListener('click',function(e)
 	{
-	
+
 		if (e.row.url)
 			showNYSenateContent(e.row.pageTitle,e.row.url,Ti.UI.currentWindow.detailView);
-	
+
 	});
-	
+
 }
 
 
 function addRow (newsItem)
 {
-	
+
 	var rowHeight = 70;
-			
+
 	var row = Ti.UI.createTableViewRow({height:rowHeight});
-	
+
 	row.url = newsItem.link;
 	row.pageTitle = newsItem.title;
 
@@ -124,13 +124,13 @@ function addRow (newsItem)
 	if (newsItem.thumbnail)
 	{
 		var cachedImage = getCachedFile(newsItem.thumbnail);
-				
+
 		if (!cachedImage)
 		{
 			cacheFile(newsItem.thumbnail);
 			cachedImage = newsItem.thumbnail;
 		}
-	
+
 		var img = Ti.UI.createImageView({
 			image:cachedImage,
 			left:0,
@@ -149,9 +149,9 @@ function addRow (newsItem)
 	return row;
 
 }
-	
 
 
-	
+
+
 loadTheNews();
 
diff --git a/Resources/views/olsearch.js b/Resources/views/olsearch.js
index 7efd69c..00d6f9a 100644
--- a/Resources/views/olsearch.js
+++ b/Resources/views/olsearch.js
@@ -53,22 +53,22 @@ xhr.setTimeout(30000);
 xhr.onerror = function (e)
 {
 	Titanium.API.debug("got xhr error: " + e);
-	
+
 	hideLoadingDialog();
-		
+
 	//alert(e);
 	Titanium.UI.createAlertDialog({title:'NY Senate', message:'There was an error accessing the legislative data. Please try again later.'}).show();
-	
+
 };
 
 xhr.onload = function()
 {
-	
+
 	try
 	{
-		
+
 		//Titanium.API.info("got xhr resp for: " + this.status + "=" + this.responseText);
-		
+
 		if (!this.responseText || this.status == 404)
 		{
 				Titanium.UI.createAlertDialog({title:'NY Senate', message:'There were no matching items for your search'}).show();
@@ -76,14 +76,14 @@ xhr.onload = function()
 		}
 		else
 		{
-		
+
 			var items = JSON.parse('{"results":' + this.responseText + '}').results;
-			
+
 			var c;
 			var x = 0;
-	
+
 			var greyBg = false;
-			
+
 			if (items.length == 0)
 			{
 				var row = Ti.UI.createTableViewRow({height:80});
@@ -92,16 +92,16 @@ xhr.onload = function()
 				row.text = "No matching results";
 				data[x++] = row;
 			}
-			
+
 			for (c in items)
 			{
 				var item = items[c];
-				
+
 			//	Titanium.API.debug("viewing item: " + c);
-				
+
 				var	itemType = item.type;
 				var title = item.type.toUpperCase();
-				
+
 				if (itemType == "bill")
 				{
 					title += " (" + item.id + ")";
@@ -110,16 +110,16 @@ xhr.onload = function()
 				{
 					title += " (" + item.billno + ")";
 				}
-				
+
 				title += ": " + item.title;
 				var itemId = item.id;
 				var summary = item.summary;
-			
+
 				var media = "../../img/btn/" + itemType + ".png";
-				
+
 				var row = Ti.UI.createTableViewRow({height:80});
 				row.hasDetail = true;
-				
+
 				if (greyBg)
 				{
 					row.backgroundColor="#eeeeee";
@@ -128,24 +128,24 @@ xhr.onload = function()
 				{
 					row.backgroundColor = "#ffffff";
 				}
-					
+
 				greyBg = !greyBg;
-				
+
 				if (itemType == "action" || itemType == "vote")
 				{
 					itemType = "bill";
 					itemId = item.billno;
 				}
-					
+
 				row.url = "http://open.nysenate.gov/legislation/api/1.0/mobile/" + itemType + "/" + escape(itemId);
 				row.pageTitle = title;
-				
-				
+
+
 				var labelTitleHeight = 40;
-				
+
 				if (summary)
 				{
-				
+
 					if (summary.length == 0)
 						labelTitleHeight = 70;
 				}
@@ -153,7 +153,7 @@ xhr.onload = function()
 				{
 					labelTitleHeight = 70;
 				}
-					
+
 				var labelTitle = Ti.UI.createLabel({
 					text:title,
 					left:5,
@@ -163,12 +163,12 @@ xhr.onload = function()
 					color:"#333333"
 				});
 				row.add(labelTitle);
-				
+
 				if (summary)
 				{
 					if (summary.length > 0)
 					{
-					
+
 						var labelSummary = Ti.UI.createLabel({
 							text:summary,
 							left:5,
@@ -179,44 +179,44 @@ xhr.onload = function()
 						row.add(labelSummary);
 					}
 				}
-				
+
 				data[x++] = row;
-				
+
 			}
-			
+
 		//	Titanium.API.debug("creating table view");
-	
+
 			tableview = Titanium.UI.createTableView({
 				data:data,
 				color:"#333333",
 				separatorColor:"#cccccc",
 				backgroundImage:'../img/bg/bglight.jpg',
 			});
-				
+
 			Titanium.UI.currentWindow.add(tableview);
-			
+
 			tableview.addEventListener('click',function(e)
 			{
-				
+
 				var wTitle = e.row.pageTitle;
 				var wUrl = e.row.url;
-				
+
 				showWebModal(wTitle,wUrl);
-			
-			
+
+
 			});
 		}
 	}
 	catch(E)
 	{
 		Titanium.API.debug("got xhr error processing response: " + E);
-		
+
 		Titanium.UI.createAlertDialog({title:'NY Senate', message:'There was an error accessing the legislative data. Please try again later.'}).show();
-	
+
 	}
-	
-	
-		
+
+
+
 	hideLoadingDialog();
 };
 
@@ -227,7 +227,7 @@ xhr.send();
 
 
 	var search = Titanium.UI.createSearchBar({
-		barColor:'#000', 
+		barColor:'#000',
 		showCancel:true,
 		height:43,
 		top:0,
@@ -235,19 +235,19 @@ xhr.send();
 	});
 
 
-	
+
 if (Titanium.Platform.name == 'iPhone OS')
 {
-	
+
 	var btnSearch = Titanium.UI.createButton({
 		title:'Search',
 		style:Titanium.UI.iPhone.SystemButtonStyle.PLAIN
 	});
-	
-	
-	
+
+
+
 	Titanium.UI.currentWindow.rightNavButton = btnSearch;
-	
+
 	btnSearch.addEventListener('click',function()
 	{
 		search.visible = true;
@@ -261,14 +261,14 @@ else
 
 	var tb1 = null;
 var tb2 = null;
- 
+
 var menuHandler = function() {
     tb1.addEventListener('click', function() {
         search.visible = true;
 		tableview.top = 45;
     });
 };
- 
+
 var activity = Ti.Android.currentActivity;
 activity.onCreateOptionsMenu = function(e) {
     var menu = e.menu;
@@ -286,7 +286,7 @@ activity.onCreateOptionsMenu = function(e) {
 search.addEventListener('change', function(e)
 {
 //	Titanium.API.info('search bar: you type ' + e.value + ' act val ' + search.value);
-	
+
 });
 search.addEventListener('cancel', function(e)
 {
@@ -298,18 +298,18 @@ search.addEventListener('cancel', function(e)
 search.addEventListener('return', function(e)
 {
 //	Titanium.UI.createAlertDialog({title:'Search Bar', message:'You typed ' + e.value }).show();
-	
+
 	var win = Titanium.UI.createWindow({
 		url:'olsearch.js',
 		title:'Search: ' + search.value
 	});
-	
+
 	win.barColor = DEFAULT_BAR_COLOR;
 	win.olterm = search.value;
 
 	Titanium.UI.currentTab.open(win,{animated:true});
-	
-	
+
+
 });
 search.addEventListener('focus', function(e)
 {
diff --git a/Resources/views/senator.js b/Resources/views/senator.js
index 6013bec..0e0e76a 100644
--- a/Resources/views/senator.js
+++ b/Resources/views/senator.js
@@ -38,14 +38,14 @@ Ti.API.info("got senator image: " + senatorImage);
 
 /*
 var cachedImage = getCachedFile(senatorImage);
-				
+
 	if (!cachedImage)
 	{
 		cacheFile(senatorImage);
 		cachedImage = senatorImage;
 	}
 	*/
-	
+
 var imgSenator = Titanium.UI.createImageView({
 	url:senatorImage,
 	width:85,
@@ -58,14 +58,14 @@ var imgSenator = Titanium.UI.createImageView({
 	borderWidth:5
 });
 
- 
+
 imgSenator.addEventListener('singletap',function(e)
 {
 	var senatorImageFull = senatorImage.replace("files/imagecache/teaser_featured_image/","files/imagecache/full_node_featured_image/" );
 
 	var htmlData = '<html><head><style>.links, .share_links { display: none;} body {margin:0px;padding:0px;font-family:"Helvetica";} h1, h2{color:#012849;} a:link,a:visited{color:#5E4D42;} .imagecache-full_node_featured_image {width:280px;max-height:200px;}</style><meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; minimum-scale=1.0; user-scalable=0;" /> <meta name="apple-mobile-web-app-capable" content="YES"></head><body><center><img src="' + senatorImageFull + '" width="100%"/></center></body></html>';
 	showHTMLContent(senatorTitleText,senatorImageFull,htmlData);
-		
+
 });
 
 win.add(imgSenator);
@@ -78,7 +78,7 @@ var messageLabel = Titanium.UI.createLabel({
 	top:40,
 	height:'auto',
 	font:{fontSize:20}
-	
+
 });
 
 win.add(messageLabel);
@@ -90,7 +90,7 @@ if (isiOS4Plus())
 	{
 tdata = [
 	{title:'Contact Information',hasChild:true,link:senatorUrl + "/contact"},
-	{title:'District Map',hasChild:true,title:'District Map',kml:'http://geo.nysenate.gov/maps/kml/sd' + senatorDistrict + '.kml?key=YgiZWjKgealrvSlyDMQRMYEaNLv2fFiz'},	
+	{title:'District Map',hasChild:true,title:'District Map',kml:'http://geo.nysenate.gov/maps/kml/sd' + senatorDistrict + '.kml?key=YgiZWjKgealrvSlyDMQRMYEaNLv2fFiz'},
 	{title:"Newsroom",hasChild:true, rss:senatorUrl+ "/content/feed"},
 	{title:'Sponsored Bills',hasChild:true,olterm:"sponsor:"+legSearchKey + " AND otype:bill AND (oid:S* or oid:A*)"},
 //	{title:'Chaired Meetings',hasChild:true,olterm:"chair:"+legSearchKey + " AND otype:meeting"},
@@ -101,7 +101,7 @@ tdata = [
 else
 {
 	tdata = [
-	{title:'Contact Information',hasChild:true,link:senatorUrl + "/contact",color:"#333333"},	
+	{title:'Contact Information',hasChild:true,link:senatorUrl + "/contact",color:"#333333"},
     {title:'District Map',hasChild:true,title:'District Map',elink:'http://www.nysenate.gov/files/imagecache/district_map/' + senatorDistrict + '_small_0.png',color:"#333333"},
 	{title:"Newsroom",hasChild:true, rss:senatorUrl+ "/content/feed",color:"#333333"},
 	{title:'Sponsored Bills',hasChild:true,olterm:"sponsor:"+legSearchKey + " AND otype:bill AND (oid:S* or oid:A*)",color:"#333333"},
@@ -121,7 +121,7 @@ row.link = twitter;
 tdata[tdata.length] = row;
 
 //tdata[tdata.length] = {title:'Twitter Feed',hasChild:true,link:twitter};
-	
+
 }
 
 
@@ -160,7 +160,7 @@ var subWin;
 // create table view event listener
 tableview.addEventListener('click', function(e)
 {
-	
+
 	if (e.rowData.ilink)
 	{
 			subWin = Titanium.UI.createWindow({
@@ -188,7 +188,7 @@ tableview.addEventListener('click', function(e)
 		});
 
 		subWin.barColor = DEFAULT_BAR_COLOR;
-	
+
 
 		Titanium.UI.currentTab.open(subWin,{animated:true});
 	}
@@ -201,7 +201,7 @@ tableview.addEventListener('click', function(e)
 		});
 
 		subWin.barColor = DEFAULT_BAR_COLOR;
-	
+
 
 		Titanium.UI.currentTab.open(subWin,{animated:true});
 	}
@@ -214,7 +214,7 @@ tableview.addEventListener('click', function(e)
 		});
 
 		subWin.barColor = DEFAULT_BAR_COLOR;
-	
+
 
 		Titanium.UI.currentTab.open(subWin,{animated:true});
 	}
@@ -227,7 +227,7 @@ tableview.addEventListener('click', function(e)
 		});
 
 		subWin.barColor = DEFAULT_BAR_COLOR;
-	
+
 
 		Titanium.UI.currentTab.open(subWin,{animated:true});
 	}
diff --git a/Resources/views/senators.js b/Resources/views/senators.js
index 1930c26..3447e3a 100644
--- a/Resources/views/senators.js
+++ b/Resources/views/senators.js
@@ -19,9 +19,9 @@ senatorView = Titanium.UI.createTableView({
 	left:0,
 	separatorColor:"#cccccc",
 	backgroundImage:'../img/bg/bglight.jpg'
-	
+
 });
-	
+
 
 	// click listener - when image is clicked
 	senatorView.addEventListener('click',function(e)
@@ -38,14 +38,14 @@ senatorView = Titanium.UI.createTableView({
 			senatorKey:senatorItems[e.index].senator.name,
 			senatorDistrict:senatorItems[e.index].senator.district,
 			modal:true
-		
+
 		});
 
 		Titanium.UI.currentTab.open(newWin,{animated:true});
-	
+
 	});
 
-	
+
 
 Titanium.UI.currentWindow.add(senatorView);
 
@@ -55,8 +55,8 @@ if (Titanium.Platform.name == 'iPhone OS')
 	var btnSearch = Titanium.UI.createButton({
 		title:'By Address'
 	});
-	
-	
+
+
 	btnSearch.addEventListener('click',function()
 	{
 		var winSearch = Titanium.UI.createWindow({
@@ -64,19 +64,19 @@ if (Titanium.Platform.name == 'iPhone OS')
 			title:'Senator Search',
 			barColor:DEFAULT_BAR_COLOR,
 			backgroundImage:'../img/bg/wood.jpg'
-	
+
 		});
-	
+
 		Titanium.UI.currentTab.open(winSearch,{animated:true});
-	
+
 	});
-			
+
 	Titanium.UI.currentWindow.rightNavButton = btnSearch;
 }
 else
 {
 	var tb1 = null;
-	 
+
 	var menuHandler = function() {
 		tb1.addEventListener('click', function() {
 			var winSearch = Titanium.UI.createWindow({
@@ -90,7 +90,7 @@ else
 
 		});
 	};
-	 
+
 	var activity = Ti.Android.currentActivity;
 	activity.onCreateOptionsMenu = function(e) {
 		var menu = e.menu;
@@ -99,47 +99,47 @@ else
 	};
 
 }
-	
+
 
 function loadSenators()
 {
-	
-	
+
+
 
 	if (senatorItems && senatorItems.length > 0)
 	{
 		//Ti.API.debug("got cached senator items");
-		
+
 			senatorRows = [];
-			
+
 			for (i = 0; i < senatorItems.length; i++)
 			{
 				senatorRows[i] = loadSenatorRow (i, senatorItems[i].senator.name, senatorItems[i].senator.district, senatorItems[i].senator.imageUrl);
-						
+
 			}
-			
+
 			senatorView.data = senatorRows;
 	}
 	else
 	{
-		
-	
-		
+
+
+
 		xhr.onerror = function (e)
 		{
 			Titanium.API.debug("got xhr error: " + e);
-			
+
 			hideLoadingDialog();
-				
+
 			//alert(e);
 			Titanium.UI.createAlertDialog({title:'NY Senate', message:'There was an error accessing the senator data. Please try again later.'}).show();
-			
+
 		};
-		
+
 		xhr.onload = function()
 		{
 		//	Titanium.API.debug("got resp: "  +this.responseText);
-			
+
 
 			cacheFile("senatorsJson",this.responseText);
 
@@ -148,8 +148,8 @@ function loadSenators()
 			hideLoadingDialog();
 
 		}
-		
-		
+
+
 		showLoadingDialog("Loading","Loading Senators...");
 
 		xhr.open("GET",senatorJsonUrl);
@@ -162,22 +162,22 @@ function parseSenatorResponse (responseText)
 {
 
 	senatorItems = JSON.parse('{"data":' + responseText + '}').data;
-		
+
 	//Titanium.API.debug("got senator items: " + senatorItems.length);
 
-	
+
 	for (i = 0; i < senatorItems.length; i++)
 	 {
-	 	
-	 	
+
+
 	 	var imageUrl = senatorItems[i].senator.imageUrl;
-	 	
-		
+
+
 	 	var idx = imageUrl.lastIndexOf("/");
 	 	imageUrl = imageUrl.substring(idx+1);
-	 	
+
 		 senatorItems[i].senator.imageFileName = imageUrl;
-	
+
 		senatorItems[i].senator.imageUrl = "../img/senators/" + escape(senatorItems[i].senator.imageFileName);
 
 		if (senatorItems[i].senator.key == "lanza")
@@ -187,20 +187,20 @@ function parseSenatorResponse (responseText)
 
 
 		//var file = Titanium.Filesystem.getFile(senatorItems[i].senator.imageUrl);
- 
-		//if(!file.exists()) { 
+
+		//if(!file.exists()) {
 		//	senatorItems[i].senator.imageUrl = imageUrl
 		 //}
 
-		
+
 		senatorItems[i].senator.imageUrlLarge = senatorItems[i].senator.imageFileName;
-		
+
 
 		senatorItems[i].senator.district = senatorItems[i].senator.district.split(' ')[3];
 		senatorRows[i] = loadSenatorRow (i, senatorItems[i].senator.name, senatorItems[i].senator.district, senatorItems[i].senator.imageUrl);
 
 		//senatorView.appendRow(senatorRows[i]);
-		
+
 	}
 
 	senatorView.data = senatorRows;
@@ -209,16 +209,16 @@ function parseSenatorResponse (responseText)
 
 function loadSenatorRow (rowIdx, name, district, thumbnail)
 {
-	
+
 	var rowHeight = 70;
-			
+
 	var row = Ti.UI.createTableViewRow({
 		height:rowHeight,
 		color:"#000000",
 		font:{fontSize:18}
 	});
-	
-	
+
+
 	var labelTitle = Ti.UI.createLabel({
 		text:name,
 		left:60,
@@ -228,7 +228,7 @@ function loadSenatorRow (rowIdx, name, district, thumbnail)
 		font:{fontSize:18}
 	});
 	row.add(labelTitle);
-	
+
 	if (district.length > 0)
 	{
 		var labelSummary = Ti.UI.createLabel({
@@ -240,7 +240,7 @@ function loadSenatorRow (rowIdx, name, district, thumbnail)
 		});
 		row.add(labelSummary);
 	}
-	
+
 	//Ti.API.debug("loading image: " + thumbnail);
 		var img = Ti.UI.createImageView({
 			image:thumbnail,
@@ -249,17 +249,17 @@ function loadSenatorRow (rowIdx, name, district, thumbnail)
 			width:55,
 			height:rowHeight
 		});
-		
+
 		row.add(img);
-			
-			
+
+
 	/*
 	var cachedImage = getCachedFile(thumbnail);
-				
+
 	if (!cachedImage)
 	{
 		Ti.API.debug("could not find cached file: " + thumbnail);
-		
+
 		cacheFile(thumbnail,null, function doit(fileUrl, savedFile)
 		{
 			Ti.API.debug("got cache file callback for: " + fileUrl);
@@ -271,13 +271,13 @@ function loadSenatorRow (rowIdx, name, district, thumbnail)
 				width:55,
 				height:rowHeight
 			});
-		
+
 			row.add(img);
-			
-			
+
+
 			//senatorRows[i].leftImage = savedFile.read();
 			//senatorView.updateRow(i,row);
-			
+
 		});
 	}
 	else
@@ -290,23 +290,23 @@ function loadSenatorRow (rowIdx, name, district, thumbnail)
 			width:55,
 			height:rowHeight
 		});
-		
+
 		row.add(img);
-			
+
 		//row.leftImage = cachedImage;
 		//senatorView.updateRow(i,row);
 	}*/
-	
-	
-		
+
+
+
 	row.hasDetail = true;
-	
-	
+
+
 	return row;
 
 }
-	
-	
+
+
 loadSenators();
 
 /*
diff --git a/Resources/views/today.js b/Resources/views/today.js
index b5ac88e..981d08c 100644
--- a/Resources/views/today.js
+++ b/Resources/views/today.js
@@ -19,34 +19,34 @@ var monthOffset = 0;
 
 function processTime (timeString)
 {
-	
+
 	var tHour = parseInt(timeString.substring(0,2),10);
 	var tMin = timeString.substring(2);
 	var tMod = "am";
-		
+
 	if (tHour >= 12)
 	{
 		tMod = "pm";
 	}
-			
+
 	if (tHour > 12)
 	{
 		tHour -= 12;
 	}
-	
+
 	return tHour + ":" + tMin + tMod;
 }
 
 //20100731T083000
 function getDateString (timeString)
 {
-	
+
 	//Ti.API.debug("get date string: " + timeString);
-	
+
 	var tYear = parseInt(timeString.substring(0,4));
 	var tMonth = parseInt(timeString.substring(4,6),10);
 	var tDay = parseInt(timeString.substring(6,8),10);
-	
+
 	return tMonth + '/' + tDay + '/' + tYear;
 
 }
@@ -54,58 +54,58 @@ function getDateString (timeString)
 /*
 
 function loadDayTable (year, month, day)
-{	
-	
+{
+
 	var win = Titanium.UI.currentWindow;
 
 	var iCalURL = "http://nysenatemobile.appspot.com/data/icalxml.jsp?cal=" + escape(calBase + year + "-" + month + "-" + day);
-	
+
 	Titanium.API.info("loading iCalUrl: " + iCalURL);
-	
+
 	var toolActInd = Titanium.UI.createActivityIndicator();
 	toolActInd.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
 	toolActInd.color = 'white';
 	toolActInd.message = 'Loading calendar...';
 	win.setToolbar([toolActInd],{animated:true});
 	toolActInd.show();
-		
+
 	var xhr = Ti.Network.createHTTPClient();
 
 
 	xhr.onload = function()
 	{
 		Titanium.API.info("got iCalUrl onload");
-			
+
 		var data = [];
-		
+
 		tableview.setData(data);
-	
+
 		var doc = this.responseXML.documentElement;
 		var items = doc.getElementsByTagName("event");
 
 		var greyBg = false;
 		var cDateString;
-		
+
 		for (var c=0;c<items.length;c++)
 		{
-			
+
 			var item = items.item(c);
-			
+
 			Titanium.API.info("parsing item: " + c);
-		
+
 			var summary = item.getElementsByTagName("summary").item(0).text;
 			var url = item.getElementsByTagName("url").item(0).text;
-			
+
 			var startDateTime = item.getElementsByTagName("starttime").item(0).text;
 			var endDateTime = item.getElementsByTagName("endtime").item(0).text;
-		
+
 			var startTime = startDateTime.substring(9,13);
 			var endTime = endDateTime.substring(9,13);
-			
+
 			var dateString = getDateString(startTime);
-			
+
 			var timeString;
-			
+
 			if (startTime == "0000")
 			{
 				timeString = "All Day";
@@ -118,27 +118,27 @@ function loadDayTable (year, month, day)
 			{
 				timeString = processTime(startTime) + " to " + processTime(endTime);
 			}
-			
+
 			Titanium.API.info("got event: " + summary);
-		
+
 			row = Ti.UI.createTableViewRow({height:80});
-				
+
 			row.pageTitle = summary;
 			row.url = url;
 			row.hasDetail = true;
-				
+
 			if ((!cDateString) || cDateString != dateString)
 			{
 				cDateString = dateString;
 				row.header = cDateString;
-				
+
 			}
-			
+
 			if (summary.length > 80)
 			{
 				summary = summary.substring(0,77) + "...";
 			}
-				
+
 			var labelTitle = Ti.UI.createLabel({
 				text:summary,
 				left:10,
@@ -147,7 +147,7 @@ function loadDayTable (year, month, day)
 				font:{fontSize:20}
 			});
 			row.add(labelTitle);
-			
+
 			var labelTime = Ti.UI.createLabel({
 				text:timeString,
 				left:10,
@@ -155,36 +155,36 @@ function loadDayTable (year, month, day)
 				font:{fontSize:16}
 			});
 			row.add(labelTime);
-					
-			
+
+
 			row.url = url;
-			
+
 			tableview.appendRow(row);
-				
-			
+
+
 		}
-	
-	
-		
+
+
+
 			toolActInd.hide();
 			win.setToolbar(null,{animated:true});
 
-			
+
 	};
-	
-	
+
+
 	xhr.onerror = function(e)
 	{
 		Titanium.API.debug("error loading iCalUrl: " + e.error);
 			toolActInd.hide();
 			win.setToolbar(null,{animated:true});
 	};
-	
+
 	xhr.setTimeout(30000);
 	xhr.open("GET",iCalURL);
 	xhr.send();
-	
-	
+
+
 
 }*/
 
@@ -213,29 +213,29 @@ function setMonthTitle (month)
 {
 
 	win.title = months[month-1];
-		
+
 }
 
 
 function loadMonthTable (year, month)
-{	
-	
+{
+
 	var win = Titanium.UI.currentWindow;
 
 	setMonthTitle(month);
-		
+
 	var iCalUrl = calBase + calType + calTag;
 	iCalUrl = iCalUrl.replace('YEAR',year);
 	iCalUrl = iCalUrl.replace('MONTH',month);
-	
+
 	iCalURL = "http://nysenatemobile.appspot.com/data/icalxml.jsp?cal=" + escape(iCalUrl);
-	
-	
+
+
 	Titanium.API.info("loading iCalUrl: " + iCalURL);
-	
+
 	showLoadingDialog("Loading","Loading Calendar...");
-	
-		
+
+
 	var xhr = Ti.Network.createHTTPClient();
 
 
@@ -245,56 +245,56 @@ function loadMonthTable (year, month)
 		hideLoadingDialog();
 
 		var data = [];
-		
+
 		var isFirst = true;
-		
+
 		tableview.setData(data);
-	
+
 		var doc = this.responseXML.documentElement;
 		var items = doc.getElementsByTagName("event");
 
 		var greyBg = false;
-		
+
 		var cDateString;
-		
+
 		var sortCalEvents = [];
 		var item;
-		
+
 		if (items)
 		{
 			for (var c=0;c<items.length;c++)
 			{
-				
-				
+
+
 			//	Ti.API.debug("building calevent: " + c);
-				
+
 				item = items.item(c);
-				
+
 				var summary = item.getElementsByTagName("summary").item(0).text;
 				var url = item.getElementsByTagName("url").item(0).text;
-				
+
 				var startDateTime = item.getElementsByTagName("starttime").item(0).text;
 				var endDateTime = item.getElementsByTagName("endtime").item(0).text;
-			
+
 				var startTime = startDateTime.substring(9,13);
 				var endTime = endDateTime.substring(9,13);
-				
+
 				sortCalEvents[c] = new CalEvent(summary, url, startDateTime, endDateTime, startTime, endTime);
 			}
-			
-			
+
+
 			sortCalEvents.sort(CalEventSort);
-			
+
 		//	Ti.API.debug("found calevents: " + sortCalEvents.length);
-			
+
 			for (var c = 0; c < sortCalEvents.length; c++)
 			{
-				
-			
+
+
 				var dateString = getDateString(sortCalEvents[c].startDateTime);
-				
+
 				var timeString;
-				
+
 				if (sortCalEvents[c].startTime == "0000")
 				{
 					timeString = "All Day";
@@ -307,36 +307,36 @@ function loadMonthTable (year, month)
 				{
 					timeString = processTime(sortCalEvents[c].startTime) + " to " + processTime(sortCalEvents[c].endTime);
 				}
-				
+
 				//Titanium.API.info("got event: " + summary + "; " + startTime + "; " + endTime);
-			
+
 				var summary = sortCalEvents[c].summary;
-				
-				
+
+
 				if (summary.length > 80)
 				{
 					summary = summary.substring(0,77) + "...";
 				}
-					
+
 				if ((!cDateString) || cDateString != dateString)
 				{
 					cDateString = dateString;
-					
+
 					row = Ti.UI.createTableViewRow({height:20});
 					row.title = cDateString;
 					row.backgroundColor = "#333333";
 					row.color = "#ffffff";
-					
+
 					tableview.appendRow(row);
-					
+
 				}
-				
+
 				row = Ti.UI.createTableViewRow({height:60});
 				row.className = 'calrow';
 				row.pageTitle = summary;
 				row.url = sortCalEvents[c].url;
 				row.hasDetail = true;
-					
+
 				var labelTitle = Ti.UI.createLabel({
 					text:summary,
 					left:10,
@@ -346,7 +346,7 @@ function loadMonthTable (year, month)
 					color:'#000'
 				});
 				row.add(labelTitle);
-				
+
 				var labelTime = Ti.UI.createLabel({
 					text:timeString,
 					left:10,
@@ -355,36 +355,36 @@ function loadMonthTable (year, month)
 					color:'#333'
 				});
 				row.add(labelTime);
-						
-				
+
+
 				row.url =  sortCalEvents[c].url;
-				
+
 				tableview.appendRow(row);
-					
-				
+
+
 			}
-	
+
 			}
-		
-			
 
 
-			
+
+
+
 	};
-	
-	
+
+
 	xhr.onerror = function(e)
 	{
 		Titanium.API.debug("error loading iCalUrl: " + e.error);
 		hideLoadingDialog();
 
 	};
-	
+
 	xhr.setTimeout(30000);
 	xhr.open("GET",iCalURL);
 	xhr.send();
-	
-	
+
+
 
 }
 
@@ -398,65 +398,65 @@ if (!tableview)
 		backgroundColor:"#ffffff",
 		opacity:.8
 	});
-	
-	
+
+
 	// add table view to the window
 	Titanium.UI.currentWindow.add(tableview);
-	
+
 	/*
 	var buttonObjects = [
 				{title:'Senate Wide', enabled:true, calBase:'http://www.nysenate.gov/calendar/ical/YEAR-MONTH'},
 				{title:'Session Calendar', enabled:true, calBase:'http://www.nysenate.gov/calendar/session/YEAR-MONTH/ical/'}
-				
-				
+
+
 				//{title:'Live Video', enabled:true, calBase:'http://www.nysenate.gov/calendar/live/ical/YEAR-MONTH'}
-				
+
 			//	{title:'Committee Meetings', enabled:true, calBase:'http://www.nysenate.gov/calendar/ical/YEAR-MONTH%3Fsenator%3DAll%2526type%3D3%2526committee%3DAll%2526initiative%3DAll'},
 				//{title:'Public Hearings', enabled:true, calBase:'http://www.nysenate.gov/calendar/ical/YEAR-MONTH%3Fsenator%3DAll%2526type%3D1%2526committee%3DAll%2526initiative%3DAll'},
-				
+
 			];
-			
-				
+
+
 			var bb1 = Titanium.UI.createButtonBar({
 				labels:buttonObjects,
 				style:Titanium.UI.iPhone.SystemButtonStyle.BAR,
 				height:35,
 				width:'auto'
 			});
-			
+
 			bb1.addEventListener('click', function(e)
 			{
 			//	for (i = 0; i < buttonObjects.length; i++)
 				//	buttonObjects[0].enabled = true;
-					
+
 				if (e.index == 0)
 				{
 					//	buttonObjects[e.index].enabled = false;
 
-				
+
 				//	win.title = 'YouTube: Short Clips';
-			//		currentChannel = 'nysenate';		
+			//		currentChannel = 'nysenate';
 					//doYouTubeSearch (currentChannel, '');
-				
+
 				//	buttonObjects[0].enabled = false;
 				//	buttonObjects[1].enabled = true;
-					
+
 				}
-				
+
 				calBase = buttonObjects[e.index].calBase;
 				Titanium.UI.currentWindow.title = "Calendar: " + buttonObjects[e.index].title;
-				
+
 				bb1.labels = buttonObjects;
-			
+
 				loadMonthTable(dToday.getFullYear(), (dToday.getMonth()+1));
 
 			});
-			
-			
+
+
 var flexSpace = Titanium.UI.createButton({
 	systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE
 });
-			
+
 			// create and add toolbar
 			var toolbar1 = Titanium.UI.createToolbar({
 				items:[flexSpace,bb1,flexSpace],
@@ -464,39 +464,39 @@ var flexSpace = Titanium.UI.createButton({
 				borderTop:true,
 				borderBottom:false,
 				backgroundColor:DEFAULT_BAR_COLOR
-			});	
-			
+			});
+
 
 			Titanium.UI.currentWindow.add(toolbar1);
 */
 
 	if (Titanium.Platform.name == 'iPhone OS')
 	{
-	
+
 
 
 		var btnNext = Titanium.UI.createButton({
 			title:'Next >'
 		});
 
-	
+
 		Titanium.UI.currentWindow.rightNavButton = btnNext;
-	
+
 		btnNext.addEventListener('click',function()
 		{
 
-			
+
 			monthOffset++;
 			loadMonthTable(dToday.getFullYear(), (dToday.getMonth()+1+monthOffset));
-			
+
 		});
-	
+
 		var btnPrev = Titanium.UI.createButton({
 			title:'< Prev'
 		});
-		
+
 		Titanium.UI.currentWindow.leftNavButton = btnPrev;
-		
+
 		btnPrev.addEventListener('click',function()
 		{
 
@@ -504,13 +504,13 @@ var flexSpace = Titanium.UI.createButton({
 			loadMonthTable(dToday.getFullYear(), (dToday.getMonth()+1+monthOffset));
 		});
 
-	
+
 	}
 	else
 	{
 		var menu1 = null;
-		var menu2 = null; 
-	 	var menu2 = null; 
+		var menu2 = null;
+	 	var menu2 = null;
 
 		var menuHandler = function() {
 			menu1.addEventListener('click', function() {
@@ -525,14 +525,14 @@ var flexSpace = Titanium.UI.createButton({
 				loadMonthTable(dToday.getFullYear(), (dToday.getMonth()+1+monthOffset));
 			});
 		};
-	 
+
 		var activity = Ti.Android.currentActivity;
 		activity.onCreateOptionsMenu = function(e) {
 			var menu = e.menu;
 			menu1 = menu.add({title : 'Prev'});
 			menu2 = menu.add({title : 'Reload'});
 			menu3 = menu.add({title : 'Next'});
-			
+
 			menuHandler();
 		};
 	}
@@ -540,18 +540,18 @@ var flexSpace = Titanium.UI.createButton({
 
 
 
-	
+
 
 tableview.addEventListener('click',function(e)
 	{
-	
+
 		if (e.row.url)
 			showNYSenateContent(e.row.pageTitle,e.row.url,Ti.UI.currentWindow.detailView);
-	
+
 	});
 
 
-	
+
 	//loadDayTable(dToday.getFullYear(), (dToday.getMonth()+1), dToday.getDate());
 	//loadMonthTable(dToday.getFullYear(), (dToday.getMonth()+1+monthOffset));
 
diff --git a/Resources/views/videos.js b/Resources/views/videos.js
index ca152c0..005bdbd 100644
--- a/Resources/views/videos.js
+++ b/Resources/views/videos.js
@@ -18,38 +18,38 @@ toolActInd.show();
 function loadVideos(searchTerm)
 {
 	toolActInd.show();
-	
+
 	var serviceCallback = function(){
 		parseVideoResponse(this.responseText);
 	};
-	
+
 	doNYSenateServiceCall('views.get',['view_name'],['video_archives'],serviceCallback);
-	
-	
+
+
 }
 
 function parseVideoResponse (responseText)
 {
 		var items = JSON.parse('{"data":' + responseText + '}').data["#data"];
-	
+
 		for (i = 0; i < items.length; i++)
 		{
-			
+
 			var guid = link.substring(link.indexOf("?v=")+3);
 			guid = guid.substring(0,guid.indexOf("&"));
-			
-			
+
+
 			var thumbnail = "http://i.ytimg.com/vi/" + guid + "/2.jpg";
-			
+
 			var row = Ti.UI.createTableViewRow({height:80});
-		
+
 			row.url = link;
 			row.guid = guid;
 			row.videotitle = title;
 			row.backgroundColor="#000000";
 			row.color ="#ffffff";
-			
-			
+
+
 			var labelTitle = Ti.UI.createLabel({
 				text:title,
 				left:105,
@@ -59,7 +59,7 @@ function parseVideoResponse (responseText)
 				color:"#ffffff"
 			});
 			row.add(labelTitle);
-			
+
 			var labelSummary = Ti.UI.createLabel({
 				text:summary,
 				left:105,
@@ -68,7 +68,7 @@ function parseVideoResponse (responseText)
 				color:"#ffffff"
 			});
 			row.add(labelSummary);
-		
+
 			var img = Ti.UI.createImageView({
 				url:thumbnail,
 				left:0,
@@ -76,11 +76,11 @@ function parseVideoResponse (responseText)
 				width:100
 			});
 			row.add(img);
-			
+
 			data[x++] = row;
-			
+
 		}
-		
+
 		if (tableview)
 		{
 			tableview.setData(data);
@@ -93,15 +93,15 @@ function parseVideoResponse (responseText)
 			separatorColor:"#000000",
 			top:45
 			});
-			
+
 			Titanium.UI.currentWindow.add(tableview);
 			tableview.addEventListener('click',function(e)
 			{
-				
+
 					playYouTube(e.row.videotitle,e.row.guid);
-			
+
 			});
-			
+
 			var btnSearch = Titanium.UI.createButton({
 				title:'Search',
 				style:Titanium.UI.iPhone.SystemButtonStyle.PLAIN
@@ -109,7 +109,7 @@ function parseVideoResponse (responseText)
 
 
 			var search = Titanium.UI.createSearchBar({
-				barColor:'#000', 
+				barColor:'#000',
 				showCancel:false,
 				hintText:'enter keywords to search',
 				height:43,
@@ -121,7 +121,7 @@ function parseVideoResponse (responseText)
 			btnSearch.addEventListener('click',function()
 			{
 				search.visible = true;
-			
+
 			});
 
 
@@ -138,16 +138,16 @@ function parseVideoResponse (responseText)
 				Titanium.API.info('search bar cancel fired');
 			    search.blur();
 				//search.visible = false;
-			
+
 			});
 			search.addEventListener('return', function(e)
 			{
 			//	Titanium.UI.createAlertDialog({title:'Search Bar', message:'You typed ' + e.value }).show();
 			 	search.blur();
 			//	search.visible = false;
-				
+
 				loadVideos (search.value);
-				
+
 			});
 			search.addEventListener('focus', function(e)
 			{
@@ -167,10 +167,10 @@ function parseVideoResponse (responseText)
 	//	alert(E);
 		Titanium.API.debug(E);
 		Titanium.UI.createAlertDialog({title:'NY Senate', message:'No videos were found for this search.'}).show();
-	
-	
+
+
 	}
-	
+
 		toolActInd.hide();
 };
 
diff --git a/Resources/views/welcome.js b/Resources/views/welcome.js
index 43b465b..acf0cb0 100644
--- a/Resources/views/welcome.js
+++ b/Resources/views/welcome.js
@@ -21,7 +21,7 @@ var messageLabel = Titanium.UI.createLabel({
 	width:'auto',
 	height:'auto',
 	opacity:0.7
-	
+
 });
 
 messageView.add(messageLabel);
@@ -44,7 +44,7 @@ find.addEventListener('click',function(e)
 {
 	win.close(	{
 				transition:Titanium.UI.iPhone.AnimationStyle.FLIP_FROM_RIGHT});
-				
+
 });
 
 win.add(find);
diff --git a/SENATE-CODE-LICENSE.txt b/SENATE-CODE-LICENSE.txt
index 9aa057e..9f3c4ab 100644
--- a/SENATE-CODE-LICENSE.txt
+++ b/SENATE-CODE-LICENSE.txt
@@ -1,21 +1,21 @@
-Open-Source Software & Software Licenses 
-In order to make the Senate's information and software as public as 
-possible, it is has adopted unique system using two types of licenses  - 
-GNU General Public License as well as the BSD License. This system is 
-meant to ensure the most public licence is used in each specific case 
-such that: 
+Open-Source Software & Software Licenses
+In order to make the Senate's information and software as public as
+possible, it is has adopted unique system using two types of licenses  -
+GNU General Public License as well as the BSD License. This system is
+meant to ensure the most public licence is used in each specific case
+such that:
 
-(i) Any Software released containing components with preexisting GPL 
-copyrights must be released pursuant to a GPL v3 copyright restriction. 
-(ii) Any Software created independently by the Senate without any 
-preexisting licensing restrictions on any of its components shall be 
-released under dual licensing and take one of two forms: (a) a BSD 
-license, or (b) a GPL v3 license.  The ultimate user of such Software 
-shall choose which form of licensing makes the most sense for his or her 
-project. 
-(iii) Regarding Software containing preexisting copyright restrictions 
-other than GPL, the CIO shall make the determination how he or she 
-wishes to release such Software. 
+(i) Any Software released containing components with preexisting GPL
+copyrights must be released pursuant to a GPL v3 copyright restriction.
+(ii) Any Software created independently by the Senate without any
+preexisting licensing restrictions on any of its components shall be
+released under dual licensing and take one of two forms: (a) a BSD
+license, or (b) a GPL v3 license.  The ultimate user of such Software
+shall choose which form of licensing makes the most sense for his or her
+project.
+(iii) Regarding Software containing preexisting copyright restrictions
+other than GPL, the CIO shall make the determination how he or she
+wishes to release such Software.
 
-GPL v3: http://www.gnu.org/copyleft/gpl.html 
+GPL v3: http://www.gnu.org/copyleft/gpl.html
 BSD: http://www.opensource.org/licenses/bsd-license.php