Improved config order for edit