Refactor main menu for login/logout stuff