Refactor Manage Sections