Nav and copy cleanup