Added modal popup control and login screen