Reorganizing handlebars templates, working on form UI