Fixed login and UI