layout and mainUIactivity, only needs comments and tests
Merge remote-tracking branch 'origin/layout' into SundayMorningVersion