Refactoring of account view.