Cleaning up top right navigation