diff --git a/frontend/app/index.html b/frontend/app/index.html
index 13fb45716f..21cd7b77a2 100644
--- a/frontend/app/index.html
+++ b/frontend/app/index.html
@@ -213,6 +213,7 @@
     <script src="scripts/controllers/MigrationCtrl.js"></script>
     <script src="scripts/controllers/misc/ResponderSelectorCtrl.js"></script>
     <script src="scripts/controllers/misc/ServerInstanceDialogCtrl.js"></script>
+    <script src="scripts/controllers/misc/TaxonomySelectionModalCtrl.js"></script>
     <script src="scripts/controllers/RootCtrl.js"></script>
     <script src="scripts/controllers/SearchCtrl.js"></script>
     <script src="scripts/controllers/SettingsCtrl.js"></script>
diff --git a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
index 2eca269f62..32164cf4a9 100644
--- a/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
+++ b/frontend/app/scripts/components/organisation/OrgCaseTemplateListCmp.js
@@ -3,7 +3,7 @@
 
     angular.module('theHiveComponents')
         .component('orgCaseTemplateList', {
-            controller: function($uibModal, $scope, CaseTemplateSrv, TagSrv, UserSrv, AuthenticationSrv, NotificationSrv, UtilsSrv, ModalUtilsSrv) {
+            controller: function($uibModal, $scope, $filter, CaseTemplateSrv, TagSrv, UserSrv, TaxonomyCacheSrv, AuthenticationSrv, NotificationSrv, UtilsSrv, ModalUtilsSrv) {
                 var self = this;
 
                 self.task = '';
@@ -121,6 +121,40 @@
                     });
                 };
 
+                self.fromTagLibrary = function() {
+                    var modalInstance = $uibModal.open({
+                        controller: 'TaxonomySelectionModalCtrl',
+                        controllerAs: '$modal',
+                        animation: true,
+                        templateUrl: 'views/partials/misc/taxonomy-selection.modal.html',
+                        size: 'lg',
+                        resolve: {
+                            taxonomies: function() {
+                                return TaxonomyCacheSrv.all();
+                            }
+                        }
+                    });
+
+                    modalInstance.result
+                        .then(function(selectedTags) {
+                            var filterFn = $filter('tagValue'),
+                                tags = [];
+
+                            _.each(selectedTags, function(tag) {
+                                tags.push({
+                                    text: filterFn(tag)
+                                });
+                            });
+
+                            self.tags = self.tags.concat(tags);
+                        })
+                        .catch(function(err) {
+                            if (err && !_.isString(err)) {
+                                NotificationSrv.error('Tag selection', err.data, err.status);
+                            }
+                        });
+                };
+
                 self.newTemplate = function() {
                     self.template = {
                         name: '',
diff --git a/frontend/app/scripts/controllers/case/CaseCreationCtrl.js b/frontend/app/scripts/controllers/case/CaseCreationCtrl.js
index ec75824b87..a8e8a4acf6 100644
--- a/frontend/app/scripts/controllers/case/CaseCreationCtrl.js
+++ b/frontend/app/scripts/controllers/case/CaseCreationCtrl.js
@@ -4,7 +4,7 @@
 (function () {
     'use strict';
     angular.module('theHiveControllers').controller('CaseCreationCtrl',
-        function ($rootScope, $scope, $uibModalInstance, CaseSrv, NotificationSrv, TagSrv, template) {
+        function ($rootScope, $scope, $uibModal, $filter, $uibModalInstance, CaseSrv, TaxonomyCacheSrv, NotificationSrv, TagSrv, template) {
 
             $rootScope.title = 'New case';
             $scope.activeTlp = 'active';
@@ -18,6 +18,8 @@
             $scope.template = template;
             $scope.fromTemplate = angular.isDefined(template) && !_.isEqual($scope.template, {});
 
+            $scope.tags = [];
+
             if ($scope.fromTemplate === true) {
 
                 // Set basic info from template
@@ -37,7 +39,7 @@
                 $scope.tasks = _.map(template.tasks, function (t) {
                     return t.title;
                 });
-                
+
             } else {
                 $scope.tasks = [];
                 $scope.newCase = {
@@ -86,6 +88,40 @@
                 });
             };
 
+            $scope.fromTagLibrary = function() {
+                var modalInstance = $uibModal.open({
+                    controller: 'TaxonomySelectionModalCtrl',
+                    controllerAs: '$modal',
+                    animation: true,
+                    templateUrl: 'views/partials/misc/taxonomy-selection.modal.html',
+                    size: 'lg',
+                    resolve: {
+                        taxonomies: function() {
+                            return TaxonomyCacheSrv.all();
+                        }
+                    }
+                });
+
+                modalInstance.result
+                    .then(function(selectedTags) {
+                        var filterFn = $filter('tagValue'),
+                            tags = [];
+
+                        _.each(selectedTags, function(tag) {
+                            tags.push({
+                                text: filterFn(tag)
+                            });
+                        });
+
+                        $scope.tags = $scope.tags.concat(tags);
+                    })
+                    .catch(function(err) {
+                        if (err && !_.isString(err)) {
+                            NotificationSrv.error('Tag selection', err.data, err.status);
+                        }
+                    });
+            };
+
             $scope.addTask = function (task) {
                 if ($scope.tasks.indexOf(task) === -1) {
                     $scope.tasks.push(task);
diff --git a/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js b/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
index 03a3548272..1089978cf1 100644
--- a/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
+++ b/frontend/app/scripts/controllers/case/ObservableCreationCtrl.js
@@ -5,7 +5,7 @@
     'use strict';
 
     angular.module('theHiveControllers').controller('ObservableCreationCtrl',
-        function($scope, $stateParams, $uibModalInstance, clipboard, CaseArtifactSrv, ObservableTypeSrv, NotificationSrv, TagSrv, params) {
+        function($scope, $stateParams, $uibModal, $uibModalInstance, $filter, TaxonomyCacheSrv, clipboard, CaseArtifactSrv, ObservableTypeSrv, NotificationSrv, TagSrv, params) {
 
             $scope.activeTlp = 'active';
             $scope.pendingAsync = false;
@@ -64,6 +64,40 @@
                 })), '', null, undefined).length;
             };
 
+            $scope.fromTagLibrary = function() {
+                var modalInstance = $uibModal.open({
+                    controller: 'TaxonomySelectionModalCtrl',
+                    controllerAs: '$modal',
+                    animation: true,
+                    templateUrl: 'views/partials/misc/taxonomy-selection.modal.html',
+                    size: 'lg',
+                    resolve: {
+                        taxonomies: function() {
+                            return TaxonomyCacheSrv.all();
+                        }
+                    }
+                });
+
+                modalInstance.result
+                    .then(function(selectedTags) {
+                        var filterFn = $filter('tagValue'),
+                            tags = [];
+
+                        _.each(selectedTags, function(tag) {
+                            tags.push({
+                                text: filterFn(tag)
+                            });
+                        });
+
+                        $scope.params.tags = $scope.params.tags.concat(tags);
+                    })
+                    .catch(function(err) {
+                        if (err && !_.isString(err)) {
+                            NotificationSrv.error('Tag selection', err.data, err.status);
+                        }
+                    });
+            };
+
             $scope.add = function(form) {
                 if (!form.$valid) {
                     return;
diff --git a/frontend/app/scripts/controllers/misc/TaxonomySelectionModalCtrl.js b/frontend/app/scripts/controllers/misc/TaxonomySelectionModalCtrl.js
new file mode 100644
index 0000000000..4f8c655642
--- /dev/null
+++ b/frontend/app/scripts/controllers/misc/TaxonomySelectionModalCtrl.js
@@ -0,0 +1,34 @@
+(function() {
+    'use strict';
+    angular.module('theHiveDirectives')
+        .controller('TaxonomySelectionModalCtrl', function($uibModalInstance, taxonomies) {
+            var self = this;
+
+            this.taxonomies = angular.copy(taxonomies);
+
+            this.formData = {
+                selectedTaxonomy: null,
+                selectedTags: null
+            };
+
+            this.addSelectedTags = function() {
+                if (!self.formData.selectedTaxonomy) {
+                    return;
+                }
+
+                var selection = _.filter(self.formData.selectedTaxonomy.tags, function(tag) {
+                    return tag.selected;
+                });
+
+                if (selection.length === 0) {
+                    return;
+                }
+
+                $uibModalInstance.close(selection);
+            };
+
+            this.cancel = function() {
+                $uibModalInstance.dismiss();
+            };
+        });
+})();
diff --git a/frontend/app/scripts/directives/updatableTagList.js b/frontend/app/scripts/directives/updatableTagList.js
index 516de74754..4e68fc36c4 100644
--- a/frontend/app/scripts/directives/updatableTagList.js
+++ b/frontend/app/scripts/directives/updatableTagList.js
@@ -1,36 +1,6 @@
 (function() {
     'use strict';
     angular.module('theHiveDirectives')
-        .controller('UpdatableTagListModalCtrl', function($uibModalInstance, taxonomies) {
-            var self = this;
-
-            this.taxonomies = angular.copy(taxonomies);
-
-            this.formData = {
-                selectedTaxonomy: null,
-                selectedTags: null
-            };
-
-            this.addSelectedTags = function() {
-                if (!self.formData.selectedTaxonomy) {
-                    return;
-                }
-
-                var selection = _.filter(self.formData.selectedTaxonomy.tags, function(tag) {
-                    return tag.selected;
-                });
-
-                if (selection.length === 0) {
-                    return;
-                }
-
-                $uibModalInstance.close(selection);
-            };
-
-            this.cancel = function() {
-                $uibModalInstance.dismiss();
-            };
-        })
         .directive('updatableTagList', function(UtilsSrv, $uibModal, $filter, NotificationSrv, TaxonomyCacheSrv) {
             return {
                 restrict: 'E',
@@ -53,10 +23,10 @@
                         this.state.type = 'library';
 
                         var modalInstance = $uibModal.open({
-                            controller: 'UpdatableTagListModalCtrl',
+                            controller: 'TaxonomySelectionModalCtrl',
                             controllerAs: '$modal',
                             animation: true,
-                            templateUrl: 'views/directives/updatable-tag-list-modal.html',
+                            templateUrl: 'views/partials/misc/taxonomy-selection.modal.html',
                             size: 'lg',
                             resolve: {
                                 taxonomies: function() {
diff --git a/frontend/app/views/components/org/case-template/details.html b/frontend/app/views/components/org/case-template/details.html
index cf7d7403fa..8c24938b5c 100644
--- a/frontend/app/views/components/org/case-template/details.html
+++ b/frontend/app/views/components/org/case-template/details.html
@@ -61,10 +61,29 @@ <h4 class="vpad10 text-primary">Case basic information</h4>
 <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="$vm.tags" placeholder="Tags" replace-spaces-with-dashes="false">
+        <tags-input class="ti-tag-selector" min-length="2" name="tags" ng-model="$vm.tags" placeholder="Tags" replace-spaces-with-dashes="false" template="views/directives/tag-input-item.html">
             <auto-complete min-length="3" debounce-delay="400" source="$vm.getTags($query)"></auto-complete>
         </tags-input>
-        <p class="help-block small vpad5">These will be the default case tags</p>
+
+        <div class="btn-toolbar mt-xxs">
+            <div class="btn-group btn-group-sm">
+                <span class="help-block small">
+                    These will be the default case tags
+                </span>
+            </div>
+
+            <div class="btn-group btn-group-sm pull-right">
+                <button class="btn btn-sm btn-default" type="button" ng-click="$vm.fromTagLibrary()">
+                    <i class="glyphicon glyphicon-plus"></i> Add from Library
+                </button>
+            </div>
+        </div>
+
+        <!-- <tags-input name="tagsInput" template="views/directives/tag-input-item.html" ng-model="params.tags" class="ti-input-sm ti-tag-selector" placeholder="Add tags" replace-spaces-with-dashes="false" min-length="2">
+            <auto-complete min-length="3" debounce-delay="400" source="getTags($query)"></auto-complete>
+        </tags-input> -->
+
+
     </div>
 </div>
 <div class="form-group" ng-class="{ 'has-error' : templateEditForm.description.$invalid && !templateEditForm.description.$pristine }">
diff --git a/frontend/app/views/partials/case/case.creation.html b/frontend/app/views/partials/case/case.creation.html
index 6e5e150af1..3d2b6201bf 100644
--- a/frontend/app/views/partials/case/case.creation.html
+++ b/frontend/app/views/partials/case/case.creation.html
@@ -1,4 +1,4 @@
-<form class="form-horizontal" name="caseCreateForm" ng-submit="createNewCase(caseCreateForm.$valid);" novalidate>
+<form name="caseCreateForm" ng-submit="createNewCase(caseCreateForm.$valid);" novalidate>
     <div class="modal-header bg-primary">
         <h3 class="modal-title">Create a new case</h3>
     </div>
@@ -7,11 +7,10 @@ <h4 class="vpad10 text-primary">Case details</h4>
         <div class="row">
             <div class="col-md-6">
                 <div class="form-group" ng-class="{ 'has-error' : caseCreateForm.title.$invalid && !caseCreateForm.title.$pristine }">
-                    <label class="col-md-3 control-label">Title
+                    <label class="control-label">Title
                         <i class="fa fa-asterisk text-danger"></i>
                     </label>
-                    <div class="col-md-9">
-
+                    <div>
                         <input class="form-control input-sm" name="title" ng-if="!fromTemplate" ng-model="newCase.title" placeholder="Title" required type="text"/>
 
                         <div class="input-group" ng-if="fromTemplate">
@@ -25,10 +24,10 @@ <h4 class="vpad10 text-primary">Case details</h4>
             </div>
             <div class="col-md-6">
                 <div class="form-group" ng-class="{ 'has-error' : caseCreateForm.startDate.$invalid && !caseCreateForm.startDate.$pristine }">
-                    <label class="col-md-3 control-label">Date
+                    <label class="control-label">Date
                         <i class="fa fa-asterisk text-danger"></i>
                     </label>
-                    <div class="col-md-9">
+                    <div>
                         <date-time-picker date="newCase.startDate" name="startDate"></date-time-picker>
                         <p class="help-block" ng-show="caseCreateForm.startDate.$invalid && !caseCreateForm.startDate.$pristine">The case start date is required.</p>
                     </div>
@@ -36,62 +35,75 @@ <h4 class="vpad10 text-primary">Case details</h4>
             </div>
         </div>
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group">
-                    <label class="col-md-3 control-label">Severity
+                    <label class="control-label">Severity
                         <i class="fa fa-asterisk text-danger"></i>
                     </label>
-                    <div class="col-md-9">
+                    <div>
                         <severity active="active" value="newCase.severity"></severity>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
                 <div class="form-group">
-                    <label class="col-md-3 control-label">TLP
+                    <label class="control-label">TLP
                         <i class="fa fa-asterisk text-danger"></i>
                     </label>
-                    <div class="col-md-9">
+                    <div>
                         <a href ng-click="activeTlp='active'">
                             <tlp format="activeTlp" on-update="updateTlp(newValue)" value="newCase.tlp"></tlp>
                         </a>
                     </div>
                 </div>
             </div>
+            <div class="col-md-4">
+                <div class="form-group">
+                    <label class="control-label">PAP
+                        <i class="fa fa-asterisk text-danger"></i>
+                    </label>
+                    <div>
+                        <a href ng-click="activePap='active'">
+                            <tlp format="activePap" on-update="updatePap(newValue)" value="newCase.pap" namespace="PAP"></tlp>
+                        </a>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-12">
                 <div class="form-group">
-                    <label class="col-md-3 control-label">Tags</label>
-                    <div class="col-md-9">
-                        <!-- <tags-input class="ti-input-sm" replace-spaces-with-dashes="false"></tags-input> -->
-                        <tags-input class="ti-input-sm input-sm form-control form-control-wrapper"
+                    <label class="control-label">Tags</label>
+                    <div>
+                        <tags-input class="ti-input-sm input-sm form-control form-control-wrapper ti-tag-selector"
                             name="tags"
-                            placeholder="Tags"
+                            placeholder="Case tags"
                             min-length="2"
                             ng-model="tags"
+                            template="views/directives/tag-input-item.html"
                             replace-spaces-with-dashes="false">
                                 <auto-complete min-length="3" debounce-delay="400" source="getTags($query)"></auto-complete>
-                            </tags-input>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label class="col-md-3 control-label">PAP
-                        <i class="fa fa-asterisk text-danger"></i>
-                    </label>
-                    <div class="col-md-9">
-                        <a href ng-click="activePap='active'">
-                            <tlp format="activePap" on-update="updatePap(newValue)" value="newCase.pap" namespace="PAP"></tlp>
-                        </a>
+                        </tags-input>
+                        <div class="pull-right mt-xxs">
+                            <div class="btn-group btn-group-sm pull-right">
+                                <button class="btn btn-sm btn-default" type="button" ng-click="fromTagLibrary()">
+                                    <i class="glyphicon glyphicon-plus"></i> Add from Library
+                                </button>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
+
+        </div>
+
+        <div class="row">
+            <div class="col-sm-12">
                 <div class="form-group" ng-class="{ 'has-error' : caseCreateForm.description.$invalid && !caseCreateForm.description.$pristine }">
-                    <label class="col-sm-3 control-label">Description
+                    <label class="control-label">Description
                         <i class="fa fa-asterisk text-danger"></i>
                     </label>
-                    <div class="col-sm-9">
+                    <div>
                         <textarea class="form-control" name="description" ng-model="newCase.description" placeholder="Case description" required rows="3"></textarea>
                         <p class="help-block" ng-show="caseCreateForm.description.$invalid && !caseCreateForm.description.$pristine">The case description is required.</p>
                     </div>
diff --git a/frontend/app/views/directives/updatable-tag-list-modal.html b/frontend/app/views/partials/misc/taxonomy-selection.modal.html
similarity index 100%
rename from frontend/app/views/directives/updatable-tag-list-modal.html
rename to frontend/app/views/partials/misc/taxonomy-selection.modal.html
diff --git a/frontend/app/views/partials/observables/creation/form.html b/frontend/app/views/partials/observables/creation/form.html
index 43de4393ac..2274e0ebe9 100644
--- a/frontend/app/views/partials/observables/creation/form.html
+++ b/frontend/app/views/partials/observables/creation/form.html
@@ -131,9 +131,17 @@
     </label>
     <div class="col-md-9">
         <input type="hidden" name="tags" ng-model="params.tagNames" ng-required="!params.message.length"/>
-        <tags-input name="tagsInput" ng-model="params.tags" class="ti-input-sm" placeholder="Add tags" replace-spaces-with-dashes="false" min-length="2">
+        <tags-input name="tagsInput" template="views/directives/tag-input-item.html" ng-model="params.tags" class="ti-input-sm ti-tag-selector" placeholder="Add tags" replace-spaces-with-dashes="false" min-length="2">
             <auto-complete min-length="3" debounce-delay="400" source="getTags($query)"></auto-complete>
         </tags-input>
+        <div class="pull-right mt-xxs">
+            <div class="btn-group btn-group-sm pull-right">
+                <button class="btn btn-sm btn-default" type="button" ng-click="fromTagLibrary()">
+                    <i class="glyphicon glyphicon-plus"></i> Add from Library
+                </button>
+            </div>
+        </div>
+
         <p class="help-block" ng-show="observableForm.tags.$invalid && !observableForm.tagsInput.$pristine">The observable(s) description or tags are required.</p>
     </div>
 </div>