Added a top navbar

This is only there to give a link back to the form.
Filter aggregate values out of indicator results

I apologize that this has a bunch of refactoring stuff in it too. I
should have done that separately.