finished fixing up the nav. [#494]