Minor changes to layouts
Moving screenlock management from onCreate to onResume
Fixing my fixes to main layouts
Starting work on Settings list view