Reworking Navigation

Need to find a better way to implement the navigation. Old automatic
method made it difficult to add sub-nav items.