Made changes to integrate login screen