[f21/master] Lightly rearrange the nav_area