dynamic subnavs, minor cleanup