Added popup on forget password and UI changes