NavBar highlighting could use some refinement

Highlighting of the element which maps to the form section the user is viewing doesn't scroll down to the last two elements if the form is not filled out. I assume this is because those parts of the form don't get high enough on the screen and is therefore arguably correct behaviour. However, it still doesn't highlight them even when the anchor tag is set to that section which I do think is broken behaviour.