diff --git a/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js b/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js
index 4d85ae349a..f5eb7d03a9 100644
--- a/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js
+++ b/ui/app/scripts/controllers/admin/AdminCaseTemplatesCtrl.js
@@ -2,7 +2,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('AdminCaseTemplatesCtrl',
-        function($scope, $uibModal, TemplateSrv, NotificationSrv, UtilsSrv, ListSrv, MetricsCacheSrv, CustomFieldsCacheSrv) {
+        function($scope, $uibModal, TemplateSrv, NotificationSrv, UtilsSrv, ListSrv, MetricsCacheSrv, CustomFieldsCacheSrv, UserSrv, UserInfoSrv) {
             $scope.task = '';
             $scope.tags = [];
             $scope.templates = [];
@@ -11,6 +11,8 @@
             $scope.templateCustomFields = [];
             $scope.templateIndex = -1;
 
+            $scope.getUserInfo = UserInfoSrv;
+
             /**
              * Convert the template custom fields definition to a list of ordered field names
              * to be used for drag&drop sorting feature
@@ -143,6 +145,9 @@
                         },
                         task: function() {
                             return task;
+                        },
+                        users: function() {
+                            return UserSrv.list({status: 'Ok'});
                         }
                     }
                 });
@@ -232,9 +237,10 @@
             };
 
         })
-        .controller('AdminCaseTemplateTasksCtrl', function($scope, $uibModalInstance, action, task) {
+        .controller('AdminCaseTemplateTasksCtrl', function($scope, $uibModalInstance, action, task, users) {
             $scope.task = task || {};
             $scope.action = action;
+            $scope.users = users;
 
             $scope.cancel = function() {
                 $uibModalInstance.dismiss();
diff --git a/ui/app/views/partials/admin/case-template/custom-fields.html b/ui/app/views/partials/admin/case-template/custom-fields.html
new file mode 100644
index 0000000000..7ca3ee934f
--- /dev/null
+++ b/ui/app/views/partials/admin/case-template/custom-fields.html
@@ -0,0 +1,42 @@
+<h4 class="vpad10 text-primary">
+    Custom fields ({{keys(template.customFields).length}})
+    <span uib-dropdown class="pull-right">
+        <a href class="dropdown-toggle" uib-dropdown-toggle>
+            <i class="fa fa-plus"></i>
+            Add custom field
+            <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu" uib-dropdown-menu>
+            <li ng-repeat="(key, value) in fields">
+                <a ng-click="addCustomField(value)">{{value.name}}</a>
+            </li>
+        </ul>
+    </span>
+</h4>
+
+<div ng-if="templateCustomFields.length !== 0" ng-init="isCollapsed=true" ui-sortable="sortableFields" ng-model="templateCustomFields">
+    <div class="panel panel-default" ng-repeat="m in templateCustomFields" ng-init="description=fields[m].description">
+        <div class="panel-heading">
+            <span class="drag-handle text-primary clickable mr-xxs">
+                <i class="fa fa-bars"></i>
+            </span>
+            <a href ng-click="isCollapsed=!isCollapsed">
+                <i class="fa" ng-class="{'fa-caret-down': isCollapsed, 'fa-caret-up': !isCollapsed}"></i>
+            </a>
+            <span class="hpad5">{{fields[m].name}}</span>
+            <span class="pull-right">
+                <a class="text-danger" href ng-click="removeCustomField(m)">
+                    <i class="fa fa-times"></i>&nbsp;Delete</a>
+            </span>
+        </div>
+        <div class="panel-body" ng-hide="isCollapsed">
+            <p ng-show="description != ''">{{description}}</p>
+            <p class="text-warning" ng-show="!description || description===''">
+                <em>No description specified</em>
+            </p>
+        </div>
+    </div>
+</div>
+<div class="empty-message" ng-if="templateCustomFields.length === 0">
+    No custom fields have been added
+</div>
diff --git a/ui/app/views/partials/admin/case-template/details.html b/ui/app/views/partials/admin/case-template/details.html
new file mode 100644
index 0000000000..6e7c948556
--- /dev/null
+++ b/ui/app/views/partials/admin/case-template/details.html
@@ -0,0 +1,57 @@
+<h4 class="vpad10 text-primary">Case basic information</h4>
+<div class="form-group">
+    <label class="col-md-3 control-label">Template name
+        <i class="fa fa-asterisk text-danger"></i>
+    </label>
+    <div class="col-md-9">
+        <input autocomplete="off" class="form-control" name="name" ng-model="template.name" placeholder="Template name" required type="text" />
+        <p class="help-block small">This name should be unique</p>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="col-md-3 control-label">Title prefix</label>
+    <div class="col-md-9">
+        <input class="form-control" name="titlePrefix" ng-model="template.titlePrefix" placeholder="Case title prefix" type="text" />
+        <p class="help-block small">This is used to prefix the case name</p>
+    </div>
+</div>
+<div class="form-group">
+    <label class="col-md-3 control-label">Severity
+        <i class="fa fa10asterisk text-danger"></i>
+    </label>
+    <div class="col-md-9">
+        <a class="clearfix" href ng-click="activeSev = true" ng-init="activeSev = false">
+            <!-- <severity value="caze.severity" active="activeSev" on-update="updateField('severity', newValue)"></severity> -->
+            <severity active="activeSev" style="float:left; font-size:16px" value="template.severity"></severity>
+        </a>
+        <p class="help-block small vpad5">This will be the default case severity</p>
+    </div>
+</div>
+<div class="form-group">
+    <label class="col-md-3 control-label">TLP
+        <i class="fa fa10asterisk text-danger"></i>
+    </label>
+    <div class="col-md-9">
+        <a class="clearfix" href ng-click="activeTlp = 'active'" ng-init="activeTlp = 'static'">
+            <tlp format="activeTlp" on-update="updateTlp(newValue)" style="float:left; font-size:16px" value="template.tlp"></tlp>
+        </a>
+        <p class="help-block small vpad5">This will be the default case TLP</p>
+    </div>
+</div>
+<div class="form-group">
+    <label class="col-md-3 control-label">Tags</label>
+    <div class="col-md-9">
+        <tags-input min-length="2" name="tags" ng-model="tags" placeholder="Tags" replace-spaces-with-dashes="false"></tags-input>
+        <p class="help-block small vpad5">These will be the default case tags</p>
+    </div>
+</div>
+<div class="form-group" ng-class="{ 'has-error' : templateEditForm.description.$invalid && !templateEditForm.description.$pristine }">
+    <label class="col-md-3 control-label">Description
+        <i class="fa fa-asterisk text-danger"></i>
+    </label>
+    <div class="col-md-9">
+        <textarea class="form-control" name="description" ng-model="template.description" placeholder="Case description" required rows="3"></textarea>
+        <p class="help-block" ng-show="templateEditForm.description.$invalid && !templateEditForm.description.$pristine">The case description is required.</p>
+    </div>
+</div>
diff --git a/ui/app/views/partials/admin/case-template/metrics.html b/ui/app/views/partials/admin/case-template/metrics.html
new file mode 100644
index 0000000000..51db83f29a
--- /dev/null
+++ b/ui/app/views/partials/admin/case-template/metrics.html
@@ -0,0 +1,40 @@
+<h4 class="vpad10 text-primary">
+    Metrics ({{template.metricNames.length || 0}})
+
+    <span uib-dropdown class="pull-right">
+        <a href class="dropdown-toggle" uib-dropdown-toggle>
+            <i class="fa fa-plus"></i>
+            Add metric
+            <span class="caret"></span>
+        </a>
+        <ul class="dropdown-menu" uib-dropdown-menu>
+            <li ng-repeat="(key, value) in metrics">
+                <a ng-click="addMetric(value)">{{value.title}}</a>
+            </li>
+        </ul>
+    </span>
+</h4>
+
+<div ng-if="template.metricNames.length !== 0" ng-init="isCollapsed=true">
+    <div class="panel panel-default" ng-repeat="m in template.metricNames" ng-init="description=metrics[m].description">
+        <div class="panel-heading">
+            <a href ng-click="isCollapsed=!isCollapsed">
+                <i class="fa" ng-class="{'fa-caret-down': isCollapsed, 'fa-caret-up': !isCollapsed}"></i>
+            </a>
+            <span class="hpad5">{{metrics[m].title}}</span>
+            <span class="pull-right">
+                <a class="text-danger" href ng-click="removeMetric(m)">
+                    <i class="fa fa-times"></i>&nbsp;Delete</a>
+            </span>
+        </div>
+        <div class="panel-body" ng-hide="isCollapsed">
+            <p ng-show="description != ''">{{description}}</p>
+            <p class="text-warning" ng-show="!description || description===''">
+                <em>No description specified</em>
+            </p>
+        </div>
+    </div>
+</div>
+<div class="empty-message" ng-if="!template.metricNames ||template.metricNames.length === 0">
+    No metrics have been added
+</div>
diff --git a/ui/app/views/partials/admin/case-template/tasks.html b/ui/app/views/partials/admin/case-template/tasks.html
new file mode 100644
index 0000000000..a0815f46bf
--- /dev/null
+++ b/ui/app/views/partials/admin/case-template/tasks.html
@@ -0,0 +1,39 @@
+<h4 class="vpad10 text-primary">
+    Tasks ({{template.tasks.length || 0}})
+    <a class="pull-right" href ng-click="addTask()">
+        <i class="fa fa-plus"></i>
+        Add task</a>
+</h4>
+<div ng-if="template.tasks.length !== 0" ui-sortable="sortableOptions" ng-model="template.tasks">
+    <div class="panel panel-default" ng-init="isCollapsed=true" ng-repeat="t in template.tasks">
+        <div class="panel-heading">
+            <span class="drag-handle text-primary clickable mr-xxs">
+                <i class="fa fa-bars"></i>
+            </span>
+            <span>
+                <a href ng-click="isCollapsed=!isCollapsed">
+                    <i class="fa" ng-class="{'fa-caret-down': isCollapsed, 'fa-caret-up': !isCollapsed}"></i>
+                </a>
+            </span>
+            <span class="hpad5">{{t.title}}</span>
+            <span class="mr-xxs" ng-if="t.owner">(Assigned to <em>{{getUserInfo.get(t.owner) | getField:'name'}}</em>)</span>
+
+            <span class="pull-right">
+                <a class="text-default" href ng-click="editTask(t)">
+                    <i class="fa fa-pencil"></i>&nbsp;Edit</a>
+                <span class="hpad5"></span>
+            <a class="text-danger" href ng-click="removeTask(t)">
+                <i class="fa fa-times"></i>&nbsp;Delete</a>
+            </span>
+        </div>
+        <div class="panel-body" ng-hide="isCollapsed">
+            <p btf-markdown="t.description" ng-show="t.description != ''"></p>
+            <p class="text-warning" ng-show="!t.description || t.description===''">
+                <em>No description specified</em>
+            </p>
+        </div>
+    </div>
+</div>
+<div class="empty-message" ng-if="!template.tasks || template.tasks.length === 0">
+    No tasks have been specified
+</div>
diff --git a/ui/app/views/partials/admin/case-templates.html b/ui/app/views/partials/admin/case-templates.html
index 09c7060e93..4bf3174d93 100644
--- a/ui/app/views/partials/admin/case-templates.html
+++ b/ui/app/views/partials/admin/case-templates.html
@@ -6,10 +6,11 @@ <h3 class="box-title">Case template management</h3>
         <div class="row">
             <div class="col-md-2">
                 <button class="btn btn-primary btn-block" ng-click="newTemplate()">
-                    <i class="fa fa-plus"></i>&nbsp;New template</button>
-                <div class="vpad10"></div>
+                    <i class="mr-xxs fa fa-plus"></i>New template</button>
+                <button class="btn btn-default btn-block" ng-click="importTemplate()">
+                    <i class="mr-xxs fa fa-upload"></i>Import template</button>
 
-                <h4 class="vpad10 text-primary">Current templates</h4>
+                <h4 class="mt-m text-primary">Current templates</h4>
                 <ul class="nav nav-pills nav-stacked" ng-show="templates">
                     <li ng-class="{'active': $index === templateIndex}" ng-repeat="template in templates">
                         <a href ng-click="loadTemplate(template.id, $index)">{{template.name}}</a>
@@ -22,225 +23,13 @@ <h4 class="vpad10 text-primary">Current templates</h4>
             <div class="col-md-10 left-border">
 
                 <form class="form-horizontal" name="templateEditForm" ng-submit="saveTemplate()" novalidate>
-                    <h4 class="vpad10 text-primary">Case basic information</h4>
-
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label class="col-md-3 control-label">Template name
-                                    <i class="fa fa-asterisk text-danger"></i>
-                                </label>
-                                <div class="col-md-9">
-                                    <input autocomplete="off" class="form-control" name="name" ng-model="template.name" placeholder="Template name" required type="text" />
-                                    <p class="help-block small">This name should be unique</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label class="col-md-3 control-label">Title prefix</label>
-                                <div class="col-md-9">
-                                    <input class="form-control" name="titlePrefix" ng-model="template.titlePrefix" placeholder="Case title prefix" type="text" />
-                                    <p class="help-block small">This is used to prefix the case name</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label class="col-md-3 control-label">Severity
-                                    <i class="fa fa10asterisk text-danger"></i>
-                                </label>
-                                <div class="col-md-9">
-                                    <a class="clearfix" href ng-click="activeSev = true" ng-init="activeSev = false">
-                                        <!-- <severity value="caze.severity" active="activeSev" on-update="updateField('severity', newValue)"></severity> -->
-                                        <severity active="activeSev" style="float:left; font-size:16px" value="template.severity"></severity>
-                                    </a>
-                                    <p class="help-block small vpad5">This will be the default case severity</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label class="col-md-3 control-label">TLP
-                                    <i class="fa fa10asterisk text-danger"></i>
-                                </label>
-                                <div class="col-md-9">
-                                    <a class="clearfix" href ng-click="activeTlp = 'active'" ng-init="activeTlp = 'static'">
-                                        <tlp format="activeTlp" on-update="updateTlp(newValue)" style="float:left; font-size:16px" value="template.tlp"></tlp>
-                                    </a>
-                                    <p class="help-block small vpad5">This will be the default case TLP</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-md-6">
-                            <div class="form-group">
-                                <label class="col-md-3 control-label">Tags</label>
-                                <div class="col-md-9">
-                                    <tags-input min-length="2" name="tags" ng-model="tags" placeholder="Tags" replace-spaces-with-dashes="false"></tags-input>
-                                    <p class="help-block small vpad5">These will be the default case tags</p>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <div class="form-group" ng-class="{ 'has-error' : templateEditForm.description.$invalid && !templateEditForm.description.$pristine }">
-                                <label class="col-md-3 control-label">Description
-                                    <i class="fa fa-asterisk text-danger"></i>
-                                </label>
-                                <div class="col-md-9">
-                                    <textarea class="form-control" name="description" ng-model="template.description" placeholder="Case description" required rows="3"></textarea>
-                                    <p class="help-block" ng-show="templateEditForm.description.$invalid && !templateEditForm.description.$pristine">The case description is required.</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="row">
-                        <div class="col-md-6">
-                            <h4 class="vpad10 text-primary">
-                                Tasks ({{template.tasks.length || 0}})
-                                <a class="pull-right" href ng-click="addTask()">
-                                    <i class="fa fa-plus"></i>
-                                    Add task</a>
-                            </h4>
-                            <div ng-if="template.tasks.length !== 0" ui-sortable="sortableOptions" ng-model="template.tasks">
-                                <div class="panel panel-default" ng-init="isCollapsed=true" ng-repeat="t in template.tasks">
-                                    <div class="panel-heading">
-                                        <span class="drag-handle text-primary clickable mr-xxs">
-                                            <i class="fa fa-bars"></i>
-                                        </span>
-                                        <span>
-                                            <a href ng-click="isCollapsed=!isCollapsed">
-                                                <i class="fa" ng-class="{'fa-caret-down': isCollapsed, 'fa-caret-up': !isCollapsed}"></i>
-                                            </a>
-                                        </span>
-                                        <span class=" hpad5">{{t.title}}</span>
-
-                                        <span class="pull-right">
-                                            <a class="text-default" href ng-click="editTask(t)">
-                                                <i class="fa fa-pencil"></i>&nbsp;Edit</a>
-                                            <span class="hpad5"></span>
-                                        <a class="text-danger" href ng-click="removeTask(t)">
-                                            <i class="fa fa-times"></i>&nbsp;Delete</a>
-                                        </span>
-                                    </div>
-                                    <div class="panel-body" ng-hide="isCollapsed">
-                                        <p btf-markdown="t.description" ng-show="t.description != ''"></p>
-                                        <p class="text-warning" ng-show="!t.description || t.description===''">
-                                            <em>No description specified</em>
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="text-danger" ng-if="!template.tasks || template.tasks.length === 0">
-                                <table class="table table-striped">
-                                    <tr>
-                                        <td>No tasks have been specified</td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                        <div class="col-md-6">
-                            <h4 class="vpad10 text-primary">
-                                Metrics ({{template.metricNames.length || 0}})
-
-                                <span uib-dropdown class="pull-right">
-                                    <a href class="dropdown-toggle" uib-dropdown-toggle>
-                                        <i class="fa fa-plus"></i>
-                                        Add metric
-                                        <span class="caret"></span>
-                                    </a>
-                                    <ul class="dropdown-menu" uib-dropdown-menu>
-                                        <li ng-repeat="(key, value) in metrics">
-                                            <a ng-click="addMetric(value)">{{value.title}}</a>
-                                        </li>
-                                    </ul>
-                                </span>
-                            </h4>
-
-                            <div ng-if="template.metricNames.length !== 0" ng-init="isCollapsed=true">
-                                <div class="panel panel-default" ng-repeat="m in template.metricNames" ng-init="description=metrics[m].description">
-                                    <div class="panel-heading">
-                                        <a href ng-click="isCollapsed=!isCollapsed">
-                                            <i class="fa" ng-class="{'fa-caret-down': isCollapsed, 'fa-caret-up': !isCollapsed}"></i>
-                                        </a>
-                                        <span class="hpad5">{{metrics[m].title}}</span>
-                                        <span class="pull-right">
-                                            <a class="text-danger" href ng-click="removeMetric(m)">
-                                                <i class="fa fa-times"></i>&nbsp;Delete</a>
-                                        </span>
-                                    </div>
-                                    <div class="panel-body" ng-hide="isCollapsed">
-                                        <p ng-show="description != ''">{{description}}</p>
-                                        <p class="text-warning" ng-show="!description || description===''">
-                                            <em>No description specified</em>
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="text-danger" ng-if="!template.metricNames ||template.metricNames.length === 0">
-                                <table class="table table-striped">
-                                    <tr>
-                                        <td>No metrics have been added</td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-
                     <div class="row">
+                        <div class="col-md-6" ng-include="'views/partials/admin/case-template/details.html'"></div>
                         <div class="col-md-6">
-                            <h4 class="vpad10 text-primary">
-                                Custom fields ({{keys(template.customFields).length}})
-                                <span uib-dropdown class="pull-right">
-                                    <a href class="dropdown-toggle" uib-dropdown-toggle>
-                                        <i class="fa fa-plus"></i>
-                                        Add custom field
-                                        <span class="caret"></span>
-                                    </a>
-                                    <ul class="dropdown-menu" uib-dropdown-menu>
-                                        <li ng-repeat="(key, value) in fields">
-                                            <a ng-click="addCustomField(value)">{{value.name}}</a>
-                                        </li>
-                                    </ul>
-                                </span>
-                            </h4>
-
-                            <div ng-if="templateCustomFields.length !== 0" ng-init="isCollapsed=true" ui-sortable="sortableFields" ng-model="templateCustomFields">
-                                <div class="panel panel-default" ng-repeat="m in templateCustomFields" ng-init="description=fields[m].description">
-                                    <div class="panel-heading">
-                                        <span class="drag-handle text-primary clickable mr-xxs">
-                                            <i class="fa fa-bars"></i>
-                                        </span>
-                                        <a href ng-click="isCollapsed=!isCollapsed">
-                                            <i class="fa" ng-class="{'fa-caret-down': isCollapsed, 'fa-caret-up': !isCollapsed}"></i>
-                                        </a>
-                                        <span class="hpad5">{{fields[m].name}}</span>
-                                        <span class="pull-right">
-                                            <a class="text-danger" href ng-click="removeCustomField(m)">
-                                                <i class="fa fa-times"></i>&nbsp;Delete</a>
-                                        </span>
-                                    </div>
-                                    <div class="panel-body" ng-hide="isCollapsed">
-                                        <p ng-show="description != ''">{{description}}</p>
-                                        <p class="text-warning" ng-show="!description || description===''">
-                                            <em>No description specified</em>
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="text-danger" ng-if="templateCustomFields.length === 0">
-                                <table class="table table-striped">
-                                    <tr>
-                                        <td>No custom fields have been added</td>
-                                    </tr>
-                                </table>
-                            </div>
+                            <div class="mt-xs" ng-include="'views/partials/admin/case-template/tasks.html'"></div>
+                            <div class="mt-xs" ng-include="'views/partials/admin/case-template/metrics.html'"></div>
+                            <div class="mt-xs" ng-include="'views/partials/admin/case-template/custom-fields.html'"></div>
                         </div>
-
                     </div>
 
                     <div class="vpad10"></div>
@@ -252,6 +41,8 @@ <h4 class="vpad10 text-primary">
                             <i class="fa fa-asterisk text-danger"></i>&nbsp;Required field</span>
                         <button class="btn btn-primary pull-right" ng-disabled="templateEditForm.$invalid" type="submit">
                             <i class="fa fa-plus"></i>&nbsp;Save case template</button>
+                        <button class="btn btn-default pull-right mr-xxxs" ng-disabled="templateEditForm.$invalid" type="button" ng-lick="exportTemplate()">
+                            <i class="fa fa-download"></i>&nbsp;Export case template</button>
                     </div>
                 </form>
             </div>
diff --git a/ui/app/views/partials/admin/case-templates.task.html b/ui/app/views/partials/admin/case-templates.task.html
index c77ed42eb5..662abd1426 100644
--- a/ui/app/views/partials/admin/case-templates.task.html
+++ b/ui/app/views/partials/admin/case-templates.task.html
@@ -9,7 +9,6 @@ <h3 class="modal-title">{{action}} task</h3>
             </label>
             <div class="col-md-9">
                 <input class="form-control" ng-model="task.title" placeholder="Task title" required type="text">
-                <p class="help-block small vpad5">This is the task name</p>
             </div>
         </div>
 
@@ -17,7 +16,15 @@ <h3 class="modal-title">{{action}} task</h3>
             <label class="col-md-3 control-label">Task description</label>
             <div class="col-md-9">
                 <markdown-editor content="task.description"></markdown-editor>
-                <p class="help-block small vpad5">This is the task description</p>
+                <p class="help-block small">Task's default description</p>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-md-3 control-label">Assignee</label>
+            <div class="col-md-9">
+                <select class="form-control" ng-model="task.owner"
+                    ng-options="item.id as item.name for item in users | orderBy:'id'"></select>                
             </div>
         </div>
     </div>