Improve Subscriptions, add UI