Update navigation to show current page

Merge this after merging #53.