Initial work.
Fixed buttons.
Updated project.
Merge branch 'switch-view' into mainscreen-contents
Merge pull request #63 from AshFurrow/mainscreen-contents

@orta => Mainscreen contents