Used new way to generate navbar.

Closes #133 @ 1h
Merge remote-tracking branch 'origin/master'