Hugo/fix navigation

Fixes #10
Fixes #11