re #6 Subscriptions are now listed, shuffling the layout a bit, too