Fix export option being hidden when no batch are defined
reorder batch field only if exists
add missing spaces