Fix status icons float after ba1e0832aa3d8a6c6217d8148fe7ad55d28bfd8d
Fix #1548 "Section template with nested section causes error"

And also add proper support for nested sections within section templates.