#426 fixes for templates and modal