Added basic login screen
Merged