Whitespace and minor code cleanup

This is by no means comprehensive, but is quite a bit better already.

Change-Id: Ibc8654a5dfb0eec39cbd0b64bdb52bb4fbfe2f7e
diff --git a/gui/devices/1920x1200/res/ui.xml b/gui/devices/1920x1200/res/ui.xml
index d0ab977..4573ded 100644
--- a/gui/devices/1920x1200/res/ui.xml
+++ b/gui/devices/1920x1200/res/ui.xml
@@ -279,7 +279,7 @@
 		<template name="progress_bar">
 			<object type="progressbar">
 				<placement x="%col_progressbar_x%" y="%row_progressbar_y%" />
-				<resource  empty="progress_empty" full="progress_full" />
+				<resource empty="progress_empty" full="progress_full" />
 				<data name="ui_progress" />
 			</object>
 
@@ -560,7 +560,7 @@
 				<data name="tw_filename" />
 				<selection name="tw_file" />
 			</object>
-			
+
 			<object type="template" name="sort_options" />
 
 			<object type="action">
@@ -616,7 +616,7 @@
 				<placement x="%center_x%" y="%row5_text_y%" placement="5" />
 				<text>%tw_file%</text>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row6_text_y%" placement="5" />
@@ -2806,13 +2806,13 @@
 				<touch key="back" />
 				<action function="page">main</action>
 			</object>
-			
+
 			<object type="template" name="footer" />
 		</page>
 
 		<page name="timezone">
 			<object type="template" name="header" />
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%row1_text_y%" placement="5" />
@@ -3291,7 +3291,7 @@
 			<object type="template" name="footer" />
 		</page>
 
-		
+
 		<page name="htcdumlock">
 			<object type="template" name="header" />
 
@@ -3381,7 +3381,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="overlay"></action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3389,7 +3389,7 @@
 			</object>
 		</page>
 
-		
+
 		<page name="filemanagerlist">
 			<object type="template" name="header" />
 
@@ -3867,7 +3867,7 @@
 				<resource base="slider" used="slider-used" touch="slider-touch" />
 				<action function="page">filemanageracction</action>
 			</object>
-			
+
 			<object type="text" color="%text_color%">
 				<font resource="font" />
 				<placement x="%center_x%" y="%slider_text_y%" placement="4" />
@@ -3883,7 +3883,7 @@
 				<touch key="home" />
 				<action function="page">main</action>
 			</object>
-				
+
 			<object type="template" name="footer" />
 		</page>