Fixed an authentication and layout bug