Moved the logout button to the MenuBar, some small changes