GEOP-63: More GPS menu tweaks