Commit after revert; relocated Nav & added courses query