Move logout link in markup

This ensures that the default tab index for the logout link is correct.