Use a grid with panels to display the subscription options
Remove old styles used for the subscription list
Merge branch 'subscription-list'