refactored wallet view