Refactor subscriptions controller and views