refactored tables in wallet view