Just format correction and putting the location button handlers into the correct place.