Refactor payment table views