diff --git a/.editorconfig b/.editorconfig
index 833bc9e..85cb735 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-# EditorConfig
+# EditorConfig.org
 root = true
 
 [*]
diff --git a/.gitignore b/.gitignore
index 7bcee0d..c232851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.tmp
 *.bak
-*.html
 Archives
 img
 Releases
diff --git a/NEWS.md b/NEWS.md
index a31d6a0..9575bd4 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
 
 ## 1.3.0 ##
 ### ?? September, 2014 ###
-* Added Splitview compatibility
+* Added Split View compatibility
 * **_HTML Skeleton_ now requires Brackets 0.44 or newer**
 * Properly detect image path relative to document ([#14](https://github.com/le717/brackets-html-skeleton/issues/14))
 * Add image shadow for Brackets dark theme
@@ -12,6 +12,7 @@
 * Compress SVG graphics
 * Refactor, simplify, improve, and lint much of the code base
 * Add meta viewport tag to "Head & Body" and "Full HTML Skeleton" snippets
+* Move toolbar button HTML into separate file
 
 ## 1.2.2 ##
 ### 8 August, 2014 ##
diff --git a/htmlContent/toolbarButton.html b/htmlContent/toolbarButton.html
new file mode 100644
index 0000000..fa316f0
--- /dev/null
+++ b/htmlContent/toolbarButton.html
@@ -0,0 +1 @@
+<a href="#" title="{{DIALOG_TITLE}}" id="html-skeleton-toolbar">
\ No newline at end of file
diff --git a/main.js b/main.js
index 48bb241..dcedaf4 100644
--- a/main.js
+++ b/main.js
@@ -29,11 +29,12 @@ define(function (require, exports, module) {
       SvgSize            = require("src/SvgSize"),
       Strings            = require("strings"),
       skeletonLogo       = require.toUrl("img/HTML-Skeleton.svg"),
-      skeletonDialogHtml = require("text!htmlContent/mainDialog.html"),
-      toolbarButtonCode  = "<a href='#' title='{{DIALOG_TITLE}}' id='html-skeleton-toolbar'>";
+      skeletonDialogHTML = require("text!htmlContent/mainDialog.html"),
+      toolbarButtonHTML  = require("text!htmlContent/toolbarButton.html");
 
   var indentUnits     = "",
-      localizedDialog = Mustache.render(skeletonDialogHtml, Strings);
+      localizedDialog = Mustache.render(skeletonDialogHTML, Strings),
+      localizedButton = Mustache.render(toolbarButtonHTML, Strings);
 
   var skeletonBones = [
       // Only the head and body tags + title and meta
@@ -106,7 +107,7 @@ define(function (require, exports, module) {
    * Insert the selected elements into the document
    * @param elements The elements to be inserted into the document
    */
-  function _insertAllTheCodes(elements) {
+  function _insertSelectedElements(elements) {
     // Get the document in the full editor
     var editor = EditorManager.getCurrentFullEditor();
 
@@ -180,8 +181,8 @@ define(function (require, exports, module) {
       finalElements.push(imageCodeFill);
     }
 
-    // Finally, run process to add the selected elements
-    _insertAllTheCodes(finalElements);
+    // Finally, add the selected elements to the document
+    _insertSelectedElements(finalElements);
   }
 
 
@@ -347,7 +348,7 @@ define(function (require, exports, module) {
    * @private
    * Display HTML Skeleton dialog box
    */
-  function _handleSkeletonButton() {
+  function _displaySkeletonDialog() {
     var skeletonDialog = Dialogs.showModalDialogUsingTemplate(localizedDialog),
         $dialog        = skeletonDialog.getElement(),
         $doneButton    = $(".dialog-button[data-button-id='ok']", $dialog);
@@ -380,12 +381,12 @@ define(function (require, exports, module) {
     ExtensionUtils.loadStyleSheet(module, "css/style.css");
 
     // Create a menu item in the Edit menu
-    CommandManager.register(Strings.INSERT_HTML_ELEMENTS, EXTENSION_ID, _handleSkeletonButton);
+    CommandManager.register(Strings.INSERT_HTML_ELEMENTS, EXTENSION_ID, _displaySkeletonDialog);
     var menu = Menus.getMenu(Menus.AppMenuBar.EDIT_MENU);
     menu.addMenuItem(EXTENSION_ID);
 
     // Create toolbar icon
-    $(Mustache.render(toolbarButtonCode, Strings)).appendTo("#main-toolbar > .buttons")
-                                                  .on("click", _handleSkeletonButton);
+    $(localizedButton).appendTo("#main-toolbar > .buttons")
+                      .on("click", _displaySkeletonDialog);
   });
 });