fixed styles for change password and some refactors