Better layout selection

[SmilyOrg]

• Common / useful layouts should be directly accessible via buttons in the app bar (e.g. map icon button for map view)
• The default layout should not be shown as "default", but as the actual layout name.

[TomK32]

Ad it doesn't remember the layout I selected previously when returning to that folder.