Changes for login screen and dashboard