Move logout button after navigation

More logical UX when tabbing
Start on improvements to navigation menu