fixed subscriptions, added navbar