merge
Task 39: Make site header sensible.
Task 38: Put menu at the top.
Add back button.
Change menu items order.
Task 38: Put menu at the top. Additional changes.
merge
merge