wip - Subscribers page refactoring