improved the location display - promise I am not the original author of this