Refactored the layout and added a change password screen.