diff --git a/webui/scripts/main.js b/webui/scripts/main.js
index e149041..5cf4fad 100644
--- a/webui/scripts/main.js
+++ b/webui/scripts/main.js
@@ -166,13 +166,13 @@ var rc = {
                 rc.settings.save();
             });
             
-            $("#settings_add").click(function() {
-                rc.settings.add();
+            $("#settings_new").click(function() {
+                rc.settings.new_setting();
             });
         },
         
-        add: function() {
-            rc.ajax.get(base_url + "ajax/admin/add-setting/");
+        new_setting: function() {
+            rc.ajax.get(base_url + "ajax/admin/new-setting/");
         },
         
         add_stringlist_field: function(id) {
diff --git a/webui/source/templates/admin/settings.tpl b/webui/source/templates/admin/settings.tpl
index 8ce9e2a..4aaae90 100644
--- a/webui/source/templates/admin/settings.tpl
+++ b/webui/source/templates/admin/settings.tpl
@@ -22,7 +22,7 @@
         <tr>
             <td colspan="2">
                 <input type="button" id="settings_save" name="save" value="Save" />
-                <input type="button" id="settings_add" name="add" value="Add Setting" />
+                <input type="button" id="settings_new" name="new_setting" value="New Setting" />
             </td>
         </tr>
     </tfoot>
diff --git a/webui/source/templates/ajax/admin/add-setting.tpl b/webui/source/templates/ajax/admin/new-setting.tpl
similarity index 71%
rename from webui/source/templates/ajax/admin/add-setting.tpl
rename to webui/source/templates/ajax/admin/new-setting.tpl
index 90b3524..1b7e1cf 100644
--- a/webui/source/templates/ajax/admin/add-setting.tpl
+++ b/webui/source/templates/ajax/admin/new-setting.tpl
@@ -5,8 +5,8 @@
     },
     
     "dialogcontent": {
-        {include file="admin/add-setting.tpl" assign=add_setting_content}
-        "content": {$add_setting_content|json_encode}
+        {include file="fragments/new-setting-dialog.tpl" assign=new_setting_dialog_content}
+        "content": {$new_setting_dialog_content|json_encode}
     }
 
 },
diff --git a/webui/source/templates/admin/add-setting.tpl b/webui/source/templates/fragments/new-setting-dialog.tpl
similarity index 100%
rename from webui/source/templates/admin/add-setting.tpl
rename to webui/source/templates/fragments/new-setting-dialog.tpl