fixed bugs
Fixed more bugs and merges
Fixed bugs associated with the login screen