Start of work cleaning up subscriptions page