Update login screen
Fix merge conflicts