Update nav markup to include active classes

Hi, this updates the navigation markup with active classes and a bit cleaner classes.