diff --git a/app/app/styles/view/document/content.scss b/app/app/styles/view/document/content.scss
index b6491edb..c9474bb0 100644
--- a/app/app/styles/view/document/content.scss
+++ b/app/app/styles/view/document/content.scss
@@ -54,7 +54,6 @@
 		}
 
 		.document-tags {
-			margin: 10px 0;
 		}
 
 		.is-template {
diff --git a/app/app/styles/widget/widget-tooltip.scss b/app/app/styles/widget/widget-tooltip.scss
index 54b83a02..c53e7b93 100644
--- a/app/app/styles/widget/widget-tooltip.scss
+++ b/app/app/styles/widget/widget-tooltip.scss
@@ -27,7 +27,7 @@
       color: $color-white;
       padding: 0.5em;
       font-size: 0.8em;
-      line-height: 1.0em;
+      line-height: 1.1em;
       &:before {
         content: "";
         display: block;
diff --git a/app/app/templates/components/document/document-toolbar.hbs b/app/app/templates/components/document/document-toolbar.hbs
index 5ae70459..36c65ca5 100644
--- a/app/app/templates/components/document/document-toolbar.hbs
+++ b/app/app/templates/components/document/document-toolbar.hbs
@@ -48,7 +48,7 @@
 							<i class="material-icons">content_copy</i>
 						</div>
 						<div class="button-gap"></div>
-						<div class="square-button button-gray" id="set-meta-button" data-tooltip="Set owner & excerpt" data-tooltip-position="top center">
+						<div class="square-button button-gray" id="set-meta-button" data-tooltip="Set owner, title, excerpt" data-tooltip-position="top center">
 							<i class="material-icons">person</i>
 						</div>
 						<div class="button-gap"></div>
@@ -69,7 +69,7 @@
 								</div>
 							</div>
 						{{/dropdown-dialog}}
-						{{#dropdown-dialog target="set-meta-button" position="bottom right" button="Save" color="flat-blue" onAction=(action 'saveMeta') selectOn="meta-excerpt"}}
+                        {{#dropdown-dialog target="set-meta-button" position="bottom right" button="Save" color="flat-blue" onAction=(action 'saveMeta') selectOn="document-name"}}
 							<div>
 								<div class="input-control">
 									<label>Owner</label>
@@ -81,6 +81,11 @@
 										optionLabelPath="fullname"
 										selection=owner}}
 								</div>
+								<div class="input-control">
+									<label>Name</label>
+									<div class="tip">Short title for this document</div>
+									{{input type='text' id="document-name" value=document.name}}
+								</div>
 								<div class="input-control">
 									<label>Excerpt</label>
 									<div class="tip">Provide short summary of the document (max. 250)</div>
diff --git a/app/app/templates/components/document/document-view.hbs b/app/app/templates/components/document/document-view.hbs
index abd9a602..9c97f7f8 100644
--- a/app/app/templates/components/document/document-view.hbs
+++ b/app/app/templates/components/document/document-view.hbs
@@ -1,5 +1,29 @@
 <div class="document-container">
     <div class="content">
+		<div class="document-summary">
+			{{document/tag-editor documentTags=document.tags isEditor=isEditor onChange=(action 'onTagChange')}}
+		</div>
+
+		{{#if attachments}}
+			<div class="attachment-zone">
+				<ul class="list">
+					{{#each attachments key="id" as |a index|}}
+						<li class="item">
+							<img class="icon" src="assets/img/attachments/{{ document/file-icon a.extension }}" />
+							<a href="{{ session.appMeta.apiUrl }}api/public/attachments/{{ session.appMeta.orgId }}/{{ a.job }}/{{ a.fileId }}">
+								<span class="file">{{ a.filename }}</span>
+							</a>
+							{{#if isEditor}}
+								<div class="action round-button-mono">
+									<i class="material-icons delete-attachment-{{a.id}}" title="Delete" {{action 'confirmDeleteAttachment' a.id a.filename}}>delete</i>
+								</div>
+							{{/if}}
+						</li>
+					{{/each}}
+				</ul>
+			</div>
+		{{/if}}
+
         <div class="pages">
             {{#each pages key="id" as |page index|}}
                 <div class="wysiwyg">
@@ -11,32 +35,6 @@
                             {{#if document.template}}
                                 <div class="is-template">TEMPLATE</div>
                             {{/if}}
-
-                            <div class="document-summary">
-
-                                {{document/tag-editor documentTags=document.tags isEditor=isEditor onChange=(action 'onTagChange')}}
-
-                                {{#if attachments}}
-                                    <div class="attachment-zone">
-                                        <ul class="list">
-                                            {{#each attachments key="id" as |a index|}}
-                                                <li class="item">
-                                                    <img class="icon" src="assets/img/attachments/{{ document/file-icon a.extension }}" />
-                                                    <a href="{{ session.appMeta.apiUrl }}api/public/attachments/{{ session.appMeta.orgId }}/{{ a.job }}/{{ a.fileId }}">
-                                                        <span class="file">{{ a.filename }}</span>
-                                                    </a>
-                                                    {{#if isEditor}}
-                                                        <div class="action round-button-mono">
-                                                            <i class="material-icons delete-attachment-{{a.id}}" title="Delete" {{action 'confirmDeleteAttachment' a.id a.filename}}>delete</i>
-                                                        </div>
-                                                    {{/if}}
-                                                </li>
-                                            {{/each}}
-                                        </ul>
-                                    </div>
-                                {{/if}}
-
-                            </div>
                         {{/if}}
 						{{section/base-renderer page=page}}
                     </div>
@@ -86,7 +84,7 @@
             <div class="regular-button button-green">
                 <i class="material-icons">add</i>
                 <div class="name">section</div>
-            </div>		
+            </div>
             <div class="message">Add a new section to this document</div>
         </div>
     </div>
diff --git a/documize/api/endpoint/router.go b/documize/api/endpoint/router.go
index 75dbff99..9bb4d255 100644
--- a/documize/api/endpoint/router.go
+++ b/documize/api/endpoint/router.go
@@ -30,7 +30,7 @@ const (
 	// AppVersion does what it says
 	// Versioning scheme major.minor where "minor" is optional
 	// e.g. 1, 2, 3, 4.1, 4.2, 5, 6, 7, 7.1, 8, 9, 10, ..... 127, 127.1, 128
-	AppVersion = "12.6"
+	AppVersion = "12.7"
 )
 
 var port, certFile, keyFile, forcePort2SSL string
diff --git a/documize/api/entity/objects.go b/documize/api/entity/objects.go
index eafd70ca..ee8622eb 100644
--- a/documize/api/entity/objects.go
+++ b/documize/api/entity/objects.go
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -14,6 +14,7 @@ package entity
 
 import (
 	"fmt"
+	"strings"
 	"time"
 )
 
@@ -152,6 +153,15 @@ type Document struct {
 	Template bool   `json:"template"`
 }
 
+// SetDefaults ensures on blanks and cleans.
+func (d *Document) SetDefaults() {
+	d.Title = strings.TrimSpace(d.Title)
+
+	if len(d.Title) == 0 {
+		d.Title = "Document"
+	}
+}
+
 // Attachment represents an attachment to a document.
 type Attachment struct {
 	BaseEntity
@@ -183,6 +193,8 @@ func (p *Page) SetDefaults() {
 	if len(p.ContentType) == 0 {
 		p.ContentType = "wysiwyg"
 	}
+
+	p.Title = strings.TrimSpace(p.Title)
 }
 
 // PageMeta holds raw page data that is used to
diff --git a/documize/api/request/page.go b/documize/api/request/page.go
index d0fac70a..5f327de7 100644
--- a/documize/api/request/page.go
+++ b/documize/api/request/page.go
@@ -1,11 +1,11 @@
 // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
 //
-// This software (Documize Community Edition) is licensed under 
+// This software (Documize Community Edition) is licensed under
 // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
 //
 // You can operate outside the AGPL restrictions by purchasing
 // Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>. 
+// by contacting <sales@documize.com>.
 //
 // https://documize.com
 
@@ -255,35 +255,35 @@ func (p *Persister) UpdatePage(page entity.Page, refID, userID string, skipRevis
 		}
 	}
 
-	if page.Level == 1 { // may need to update the document name
-		var doc entity.Document
+	//if page.Level == 1 { // may need to update the document name
+	//var doc entity.Document
 
-		stmt4, err := p.Context.Transaction.Preparex("SELECT id, refid, orgid, labelid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE refid=?")
-		defer utility.Close(stmt4)
+	//stmt4, err := p.Context.Transaction.Preparex("SELECT id, refid, orgid, labelid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE refid=?")
+	//defer utility.Close(stmt4)
 
-		if err != nil {
-			log.Error(fmt.Sprintf("Unable to prepare pagemanager doc query for Id %s", page.DocumentID), err)
-			return err
-		}
+	//if err != nil {
+	//log.Error(fmt.Sprintf("Unable to prepare pagemanager doc query for Id %s", page.DocumentID), err)
+	//return err
+	//}
 
-		err = stmt4.Get(&doc, page.DocumentID)
+	//err = stmt4.Get(&doc, page.DocumentID)
 
-		if err != nil {
-			log.Error(fmt.Sprintf("Unable to execute pagemanager document query for Id %s", page.DocumentID), err)
-			return err
-		}
+	//if err != nil {
+	//log.Error(fmt.Sprintf("Unable to execute pagemanager document query for Id %s", page.DocumentID), err)
+	//return err
+	//}
 
-		if doc.Title != page.Title {
-			doc.Title = page.Title
-			doc.Revised = page.Revised
-			err = p.UpdateDocument(doc)
+	//if doc.Title != page.Title {
+	//doc.Title = page.Title
+	//doc.Revised = page.Revised
+	//err = p.UpdateDocument(doc)
 
-			if err != nil {
-				log.Error(fmt.Sprintf("Unable to update document when page 1 altered DocumentId %s", page.DocumentID), err)
-				return err
-			}
-		}
-	}
+	//if err != nil {
+	//log.Error(fmt.Sprintf("Unable to update document when page 1 altered DocumentId %s", page.DocumentID), err)
+	//return err
+	//}
+	//}
+	//}
 
 	p.Base.Audit(p.Context, "update-page", page.DocumentID, page.RefID)