diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index a73364b06..0c848bc7c 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -258,7 +258,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			'$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
 			'$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''),
 			'$pageRename' => array('pageRename', t('Enter the new name:'), '', ''),
-			'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="(optional) Enter a custom message when saving the page..."'),
+			'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'),
 			'$pageHistory' => $pageHistory['history'],
 			'$wikiModal' => $wikiModal,
 			'$wikiModalID' => $wikiModalID,
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 94e7c0f3e..c4426268c 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -1,19 +1,12 @@
-{{if $hideEditor}}
-<div>
-	<p class="lead text-center">{{$chooseWikiMessage}}</p>
-</div>
-{{/if}}
 <div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
-  <div class="section-title-wrapper">
-			
-    <div class="pull-right">
-				{{if $showPageControls}}
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			{{if $showPageControls}}
 			<div class="btn-group">
 				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
 					<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
 				</button>
-				<ul class="dropdown-menu">						
-					
+				<ul class="dropdown-menu dropdown-menu-right">
 					<li class="nav-item">
 						<a id="rename-page" class="nav-link" href="#"><i class="fa fa-edit"></i>&nbsp;Rename Page</a>
 					</li>
@@ -23,84 +16,65 @@
 					<li class="nav-item">
 						<a id="embed-image" class="nav-link" href="#"><i class="fa fa-picture-o"></i>&nbsp;Embed Image</a>
 					</li>
-
 				</ul>
 			</div>	
-				
-		{{/if}}
-				
-      <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-      <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-    </div>
-	  <h2><span id="wiki-header-name"><i class="fa fa-book"></i>&nbsp<b>{{$wikiheaderName}}</b></span>&nbsp:&nbsp
-		  <span id="wiki-header-page">{{$wikiheaderPage}}</span>
-		</h2>
-    <div class="clear"></div>
-  </div>
-  
-		
-  
-    <div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-      <form id="rename-page-form" action="wiki/rename/page" method="post" >
-        <div class="clear"></div>
-        {{include file="field_input.tpl" field=$pageRename}}
-        <div class="btn-group pull-right">
-            <button id="rename-page-submit" class="btn btn-warning" type="submit" name="submit" >Rename Page</button>
-        </div>
-      </form>        <div class="clear"></div>
-      <hr>
-    </div>
-
-  <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
-	   	
-    <ul class="nav nav-tabs" id="wiki-nav-tabs">
-      <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
-      <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
-      <li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
-	
-    </ul>
-				
-			<div class="tab-content" id="wiki-page-tabs">
-
-      <div id="edit-pane" class="tab-pane fade">
-        <div id="ace-editor"></div>
-		{{if $showCommitMsg}}
-		  {{if $showPageControls}}
-		<div>
-				  <div id="id_{{$commitMsg.0}}_wrapper" class='form-group field input'>
-			  <label for='id_{{$commitMsg.0}}' id='label_{{$commitMsg.0}}'>{{$commitMsg.1}}{{if $commitMsg.4}}<span class="required"> {{$commitMsg.4}}</span>{{/if}}</label>
-			  <span>
-					  <input class="" style="width: 80%;" name='{{$commitMsg.0}}' id='id_{{$commitMsg.0}}' type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-					  <a id="save-page" href="#" class="btn btn-primary btn-md disabled">Save</a>
-			  </span>
-			  <span id='help_{{$commitMsg.0}}' class='help-block'>{{$commitMsg.3}}</span>
-
-			  <div class="clear"></div>
-		  </div>
+			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
-		{{/if}}
-		{{/if}}
-      </div>      
-      <div id="preview-pane" class="tab-pane fade in active">
-        <div id="wiki-preview">
-          {{$renderedContent}}
-        </div>
-      </div>
-      <div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}>
-        <div id="page-history-list">
-        </div>
-      </div>    
-	
-      </div>  
-
-
-    </div>
-  </div>
+		<h2>
+			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
+			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
+		</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+		<form id="rename-page-form" action="wiki/rename/page" method="post" >
+			{{include file="field_input.tpl" field=$pageRename}}
+			<div class="btn-group pull-right">
+				<button id="rename-page-submit" class="btn btn-warning" type="submit" name="submit" >Rename Page</button>
+			</div>
+		</form>
+		<div class="clear"></div>
+	</div>
+	<div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
+		<ul class="nav nav-tabs" id="wiki-nav-tabs">
+			<li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
+			<li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
+			<li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
+		</ul>
+		<div class="tab-content" id="wiki-page-tabs">
+			<div id="edit-pane" class="tab-pane fade">
+				<div id="ace-editor"></div>
+				{{if $showCommitMsg}}
+				{{if $showPageControls}}
+				<div>
+					<div id="id_{{$commitMsg.0}}_wrapper" class="form-group field input">
+						<div class="input-group">
+							<input class="widget-input" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+							<div class="input-group-btn">
+								<button id="save-page" type="button" class="btn btn-primary btn-sm disabled">Save</button>
+							</div>
+						</div>
+					</div>
+				</div>
+				{{/if}}
+				{{/if}}
+			</div>
+			<div id="preview-pane" class="tab-pane fade in active">
+				<div id="wiki-preview">
+					{{$renderedContent}}
+				</div>
+			</div>
+			<div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}>
+				<div id="page-history-list"></div>
+			</div>
+		</div>
+	</div>
 </div>
 
 {{$wikiModal}}
 
-
 <div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">