Fixed issue with styling and js not appearing in login screen; minor fixes to login screen and logic