1. Fix Change Password Popup
2. Add Views/Overlay