Bug fix and login page