View mode now working.
Merge conflict solved
Some renaming
Merge branch 'menu_layouts' into start_up_screen