More refactoring for design section and option reorder methods