Upgrade/downgrade of subscriptions (fix #32) and improved nav (fix #25)