Allow the editing of pickup/delivery locations

Also reformatted the cancel pickup option.