diff --git a/app/components/templates/templates.html b/app/components/templates/templates.html
index 4d2e0dd71..bf05cbbfb 100644
--- a/app/components/templates/templates.html
+++ b/app/components/templates/templates.html
@@ -27,7 +27,7 @@
             </div>
             <div class="form-group">
               <div class="col-sm-12">
-                <span class="template-note" ng-bind-html="state.selectedTemplate.Note"></span>
+                <div class="template-note" ng-if="state.selectedTemplate.Note" ng-bind-html="state.selectedTemplate.Note"></div>
               </div>
             </div>
           </div>
diff --git a/app/models/api/template.js b/app/models/api/template.js
index 01532f6f6..3883edf4f 100644
--- a/app/models/api/template.js
+++ b/app/models/api/template.js
@@ -16,11 +16,18 @@ function TemplateViewModel(data) {
   this.Volumes = [];
   if (data.volumes) {
     this.Volumes = data.volumes.map(function (v) {
-      return {
-        readOnly: false,
-        containerPath: v,
+      var volume = {
+        readOnly: v.readonly || false,
+        containerPath: v.container || v,
         type: 'auto'
       };
+
+      if (v.bind) {
+        volume.name = v.bind;
+        volume.type = 'bind';
+      }
+
+      return volume;
     });
   }
   this.Ports = [];