Basics of layout changes done.
Merge branch 'master' into mainscreen-contents
Fixes tests.
Merge pull request #68 from AshFurrow/mainscreen-contents

@orta => Basics of layout changes done.