diff --git a/js/dictionaryBuilder.js b/js/dictionaryBuilder.js
index 042cb6c..b851660 100644
--- a/js/dictionaryBuilder.js
+++ b/js/dictionaryBuilder.js
@@ -107,24 +107,6 @@ function AddWord() {
     errorMessageArea.innerHTML = errorMessage;
 }
 
-function WordAtIndexWasChanged(indexString, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition) {
-     return (!currentDictionary.settings.caseSensitive && currentDictionary.words[parseInt(indexString)].name.toLowerCase() != word.toLowerCase()) ||
-            (currentDictionary.settings.caseSensitive && currentDictionary.words[parseInt(indexString)].name != word) ||
-            currentDictionary.words[parseInt(indexString)].pronunciation != pronunciation ||
-            currentDictionary.words[parseInt(indexString)].partOfSpeech != partOfSpeech ||
-            currentDictionary.words[parseInt(indexString)].simpleDefinition != simpleDefinition ||
-            currentDictionary.words[parseInt(indexString)].longDefinition != longDefinition;
-}
-
-function SaveScroll() {
-    var doc = document.documentElement;
-    var left = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
-    var top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
-
-    savedScroll.x = left;
-    savedScroll.y = top;
-}
-
 function EditWord(index) {
     SaveScroll();
     if (wordFormIsLocked()) {
@@ -144,20 +126,6 @@ function EditWord(index) {
     document.getElementById("editWordButtonArea").style.display = "block";
 }
 
-function SaveAndUpdateDictionary(keepFormContents) {
-    if (!currentDictionary.settings.sortByEquivalent) {
-        currentDictionary.words.sort(dynamicSort("name"));
-    } else {
-        currentDictionary.words.sort(dynamicSort("simpleDefinition"));
-    }
-    SaveDictionary(true, true);
-    ShowDictionary();
-    if (!keepFormContents) {
-        ClearForm();
-    }
-    CloseUpdateConflictArea('newWordButtonArea');
-}
-
 function UpdateWord(wordIndex, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition) {
     currentDictionary.words[wordIndex].name = word;
     currentDictionary.words[wordIndex].pronunciation = pronunciation;
@@ -357,15 +325,6 @@ function SaveSettings() {
     LoadUserDictionaries();
 }
 
-function CheckForPartsOfSpeechChange() {
-    if (htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value) != currentDictionary.settings.partsOfSpeech) {
-        if (htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value) != "") {
-            currentDictionary.settings.partsOfSpeech = htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value);
-            SetPartsOfSpeech();
-        }
-    }
-}
-
 function EmptyWholeDictionary() {
     if (confirm("This will delete the entire current dictionary. If you do not have a backed up export, you will lose it forever!\n\nDo you still want to delete?")) {
         CreateNewDictionary();
@@ -414,6 +373,20 @@ function ResetDictionaryToDefault() {
     currentDictionary = JSON.parse(defaultDictionaryJSON);
 }
 
+function SaveAndUpdateDictionary(keepFormContents) {
+    if (!currentDictionary.settings.sortByEquivalent) {
+        currentDictionary.words.sort(dynamicSort("name"));
+    } else {
+        currentDictionary.words.sort(dynamicSort("simpleDefinition"));
+    }
+    SaveDictionary(true, true);
+    ShowDictionary();
+    if (!keepFormContents) {
+        ClearForm();
+    }
+    CloseUpdateConflictArea('newWordButtonArea');
+}
+
 function SaveDictionary(sendToDatabase, sendWords) {
     localStorage.setItem('dictionary', JSON.stringify(currentDictionary));
     
@@ -670,6 +643,33 @@ function WordIndex(word) {
     return -1;
 }
 
+function WordAtIndexWasChanged(indexString, word, pronunciation, partOfSpeech, simpleDefinition, longDefinition) {
+     return (!currentDictionary.settings.caseSensitive && currentDictionary.words[parseInt(indexString)].name.toLowerCase() != word.toLowerCase()) ||
+            (currentDictionary.settings.caseSensitive && currentDictionary.words[parseInt(indexString)].name != word) ||
+            currentDictionary.words[parseInt(indexString)].pronunciation != pronunciation ||
+            currentDictionary.words[parseInt(indexString)].partOfSpeech != partOfSpeech ||
+            currentDictionary.words[parseInt(indexString)].simpleDefinition != simpleDefinition ||
+            currentDictionary.words[parseInt(indexString)].longDefinition != longDefinition;
+}
+
+function CheckForPartsOfSpeechChange() {
+    if (htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value) != currentDictionary.settings.partsOfSpeech) {
+        if (htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value) != "") {
+            currentDictionary.settings.partsOfSpeech = htmlEntities(document.getElementById("dictionaryPartsOfSpeechEdit").value);
+            SetPartsOfSpeech();
+        }
+    }
+}
+
+function SaveScroll() {
+    var doc = document.documentElement;
+    var left = (window.pageXOffset || doc.scrollLeft) - (doc.clientLeft || 0);
+    var top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0);
+
+    savedScroll.x = left;
+    savedScroll.y = top;
+}
+
 function htmlEntities(string) {
     return String(string).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&apos;').replace(/\\/g, '&#92;').replace(/\n/g, '<br>');
 }
diff --git a/js/ui.js b/js/ui.js
index 0a0ae8a..1102b60 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -119,18 +119,6 @@ function ValidateAccountSettings() {
     }
 }
 
-function WarnEmailChange() {
-    var emailChangeWarning = document.getElementById("accountSettingsEmailChangeWarning");
-    var emailValue = document.getElementById("accountSettingsEmailField").value;
-    var originalEmailValue = document.getElementById("accountSettingsPreviousEmailField").value;
-
-    if (emailValue != originalEmailValue) {
-        emailChangeWarning.style.display = "block";
-    } else {
-        emailChangeWarning.style.display = "none";
-    }
-}
-
 function ValidateForgotPassword() {
     var errorMessage = document.getElementById("forgotError");
     var emailValue = document.getElementById("forgotEmailField").value;
@@ -174,6 +162,18 @@ function ValidateResetPassword() {
     }
 }
 
+function WarnEmailChange() {
+    var emailChangeWarning = document.getElementById("accountSettingsEmailChangeWarning");
+    var emailValue = document.getElementById("accountSettingsEmailField").value;
+    var originalEmailValue = document.getElementById("accountSettingsPreviousEmailField").value;
+
+    if (emailValue != originalEmailValue) {
+        emailChangeWarning.style.display = "block";
+    } else {
+        emailChangeWarning.style.display = "none";
+    }
+}
+
 function LoggedInResetPassword() {
     var resetPasswordRequest = new XMLHttpRequest();
     resetPasswordRequest.open('GET', "php/ajax_setnewpassword.php");
@@ -340,21 +340,6 @@ function HideAccountSettings() {
         document.getElementById("accountSettingsScreen").style.display = "none";
 }
 
-function ShowDictionaryDeleteMenu(dictionaryList) {
-    document.getElementById('loadAfterDeleteScreen').style.display = 'block';
-    //Parse response into the list that forces you to load one and reload select in settings.
-    ParseUserDictionariesIntoSelect(document.getElementById("loadAfterDelete"), dictionaryList);
-    ParseUserDictionariesIntoSelect(document.getElementById("userDictionaries"), dictionaryList);
-}
-
-function ToggleCaseSensitiveOption() {
-    if (document.getElementById("dictionaryAllowDuplicates").checked) {
-        document.getElementById("dictionaryCaseSensitive").disabled = true;
-    } else {
-        document.getElementById("dictionaryCaseSensitive").disabled = false;
-    }
-}
-
 function ShowSettings() {
     document.getElementById("settingsScreen").style.display = "block";
     document.getElementById("dictionaryNameEdit").value = htmlEntitiesParse(currentDictionary.name);
@@ -371,6 +356,17 @@ function ShowSettings() {
     document.getElementById("numberOfWordsInDictionary").innerHTML = currentDictionary.words.length.toString();
 }
 
+function HideSettings() {
+    document.getElementById("settingsScreen").style.display = "none";
+    if (currentDictionary.settings.isComplete) {
+        LockWordForm();
+        document.getElementById("wordEntryForm").style.display = "none";
+    } else {
+        document.getElementById("wordEntryForm").style.display = "block";
+    }
+    
+}
+
 function HideSettingsWhenComplete() {
     if (document.getElementById("settingsScreen")) {
         if (currentDictionary.settings.isComplete) {
@@ -381,6 +377,21 @@ function HideSettingsWhenComplete() {
     }
 }
 
+function ShowDictionaryDeleteMenu(dictionaryList) {
+    document.getElementById('loadAfterDeleteScreen').style.display = 'block';
+    //Parse response into the list that forces you to load one and reload select in settings.
+    ParseUserDictionariesIntoSelect(document.getElementById("loadAfterDelete"), dictionaryList);
+    ParseUserDictionariesIntoSelect(document.getElementById("userDictionaries"), dictionaryList);
+}
+
+function ToggleCaseSensitiveOption() {
+    if (document.getElementById("dictionaryAllowDuplicates").checked) {
+        document.getElementById("dictionaryCaseSensitive").disabled = true;
+    } else {
+        document.getElementById("dictionaryCaseSensitive").disabled = false;
+    }
+}
+
 function TogglePublicLink() {
     if (document.getElementById("dictionaryIsPublic").checked) {
         var publicLink = "http://lexicon.ga/view/?dict=" + currentDictionary.externalID;
@@ -435,17 +446,6 @@ function ShowFilterWordCount(numberOfWords) {
     }
 }
 
-function HideSettings() {
-    document.getElementById("settingsScreen").style.display = "none";
-    if (currentDictionary.settings.isComplete) {
-        LockWordForm();
-        document.getElementById("wordEntryForm").style.display = "none";
-    } else {
-        document.getElementById("wordEntryForm").style.display = "block";
-    }
-    
-}
-
 function NewWordNotification(word) {
     var notificationArea = document.getElementById("notificationArea");
     var notificationMessage = document.getElementById("notificationMessage");