Feature/login screen rectifications

Latest development merged: YES