Change labels and fix merchant submit orders lat and long