Improve upon the location display a bit