Fixes for index page, and login page