Nav changes

Made the tweaks mentioned in #20