Refactor Sections, doing adjustments for sections
Merge remote-tracking branch 'origin/master'