Simplify subnavigation code'