More refactoring on the account screens, also got change password finished.