Merge login screen changes