Refactored view accounts