tweaks to modal model/template