Subscribers can now be viewed through the client

Also cleaned up some code and improved readability
Improved reuse of templates in client