Subscription view
Subscription package fixes