Move modal forms to their own templates