nav content exists, minor renames
cleaned up a bit