Removing the double login/logout screens. Cleaning it up