Top nav cleanup