More sub nav cleanup