Move the logout button to the settings menu.

Another pull request for this branch, to merge to master.