Logout button placement, initialization refactoring