Updated login and main views