Switch to layout modals, remove unecessary modal_form.hbs modal layout.

@dtothefp ready for review