Feature/tidy nav

some tidying up. Let me know what you think of the UG/PG and year markers.