refactored existing views, added payment entity view