diff --git a/scratch/css/editor.css b/scratch/css/editor.css
index 51777e14..4b49b901 100644
--- a/scratch/css/editor.css
+++ b/scratch/css/editor.css
@@ -6,6 +6,7 @@
 #gollum-editor {
   border: 1px solid #e4e4e4;
   background: #f9f9f9;
+  margin-bottom: 5em;
   overflow: hidden;
   padding: 1em;
 
diff --git a/scratch/edit.html b/scratch/edit.html
index a22342ef..1fc56a9a 100644
--- a/scratch/edit.html
+++ b/scratch/edit.html
@@ -30,14 +30,14 @@
       <div id="gollum-editor-function-bar">
         <a href="#" id="function-bold" class="function-button">Bold</a>
         <a href="#" id="function-italic" class="function-button">Italic</a>
-        <a href="#" id="function-underline" class="function-button">
-          Underline</a>
         <a href="#" id="function-code" class="function-button">Code</a>
         <span class="function-divider">&nbsp;</span>
         <a href="#" id="function-ul" class="function-button">Unordered List</a>
         <a href="#" id="function-ol" class="function-button">Ordered List</a>
         <a href="#" id="function-blockquote" class="function-button">
           Blockquote</a>
+        
+        <a href="#" id="function-hr" class="function-button">Horizontal Rule</a>
         <span class="function-divider">&nbsp;</span>
         <a href="#" id="function-link" class="function-button">Link</a>
         <a href="#" id="function-image" class="function-button">Image</a>
@@ -52,9 +52,6 @@
     </div>
   </div>
 </div>
-<div id="footer">
-  <p id="last-edit">Last edited by <span class="username">username</span>, 13:20:21 GMT</p>
-</div>
 </div>
 
 <script type="text/javascript" src="js/jquery.js"></script>
diff --git a/scratch/js/gollum-editor/gollum.editor.js b/scratch/js/gollum-editor/gollum.editor.js
index c6e3fba3..3cf77c3e 100644
--- a/scratch/js/gollum-editor/gollum.editor.js
+++ b/scratch/js/gollum-editor/gollum.editor.js
@@ -42,7 +42,6 @@
           debug('Loading language definition for ' + ActiveOptions.MarkupType);
           LanguageDefinition.loadFor( ActiveOptions.MarkupType, 
             function(data, textStatus) { 
-              console.log( data, textStatus );
               if ( textStatus != 'success' ) {
                 debug('Language definition could not be loaded for markup '
                       + 'type ' + ActiveOptions.MarkupType);
@@ -72,7 +71,6 @@
    *  Used by the definitions in langs/ to register language definitions.
    */
   $.GollumEditor.defineLanguage = function( language_name, languageObject ) {
-    console.log('Defining language for ' + language_name);
     if ( typeof languageObject == 'object' )
       LanguageDefinition.define( language_name, languageObject );
     else 
@@ -288,6 +286,7 @@
                       .getFieldSelectionPosition( $('#gollum-editor-body') );
         var selText = FunctionBar.getFieldSelection( $('#gollum-editor-body') );
         var repText = selText;
+        var reselect = true;
         
         // execute a replacement function if one exists
         if ( definitionObject.exec && 
@@ -315,12 +314,16 @@
         // append if necessary
         if ( definitionObject.append && 
              typeof definitionObject.append == 'string' ) {
+          if ( repText == selText ) {
+            reselect = false;
+          }
           repText += definitionObject.append;
+          
         }
         
         if (repText)
           FunctionBar.replaceFieldSelection( $('#gollum-editor-body'), 
-                                             repText );
+                                             repText, reselect );
         
       },
       
@@ -370,15 +373,20 @@
        *
        *  @param  jQuery  A jQuery object for the textarea.
        *  @param  string  The string to replace the current selection with.
+       *  @param  boolean Reselect the new text range.
        */
-      replaceFieldSelection: function( $field, replaceText ) {
+      replaceFieldSelection: function( $field, replaceText, reselect ) {
         var selPos = FunctionBar.getFieldSelectionPosition( $field );
         var fullStr = $field.val();
+        var selectNew = true;
+        if ( reselect === false) {
+          var selectNew = false;
+        }
         
         $field.val( fullStr.substring(0, selPos.start) + replaceText + 
                     fullStr.substring(selPos.end));
         
-        if ( $field[0].setSelectionRange ) {
+        if ( selectNew && $field[0].setSelectionRange ) {
           $field[0].focus();
           $field[0].setSelectionRange( selPos.start, 
                                        selPos.start + replaceText.length );