Refactor/account page