pulled nav into its own module, main nav tweaks