extended navigation, and moved unittypes into the same fold as all the other nav options