Reorder for consistency
Tidy navigation bar

There are still some issues with the navigation and administration
blocks.

Fixes #2