New navigation updates for Subscription page
Merge branch 'bolson'