Add section contents at top of file
Cleanup section headers
Move comments above settings