Added course nav + some cleanup