Ian/nav

minor style changes @nicolashery