restructured templates
add_note implemented