Created OptionSection
Moved everything from manager to controller