Added Login Screen and some more changes