fixes #25

 Remove X button, place 'logout' in top-right list #25
I commented out the original logout button and added the logout to the menu.