Fix indentation problems, close #3
Assign sections to template when saving