diff --git a/index.php b/index.php
index 43f1da5..539ed42 100644
--- a/index.php
+++ b/index.php
@@ -8,12 +8,13 @@ $dictionary_to_load = (isset($_GET['dict'])) ? intval($_GET['dict']) : 0;
 $the_public_dictionary = '"That dictionary doesn\'t exist."';
 $dictionary_name = 'ERROR';
 $dictionary_creator = 'nobody';
-$is_viewing = $dictionary_to_load > 0;
 
 $word_to_load = (isset($_GET['word'])) ? intval($_GET['word']) : 0;
 $the_public_word = '"That word doesn\'t exist."';
 $word_name = 'ERROR';
 
+$display_mode = ($dictionary_to_load > 0) ? (($word_to_load > 0) ? "word" : "view") : "build";
+
 $announcement = get_include_contents(SITE_LOCATION . '/announcement.php');
 $notificationMessage = "";
 
@@ -27,35 +28,66 @@ if ($current_user > 0 || !isset($_SESSION['loginfailures']) || (isset($_SESSION[
 
 require_once(SITE_LOCATION . '/php/notificationconditiontree.php');
 
-if ($is_viewing) {
-    $query = "SELECT `d`.`id`, `d`.`name`, `d`.`description`, `u`.`public_name`, `d`.`words`, `d`.`parts_of_speech`, `d`.`is_complete` ";
-    $query .= "FROM `dictionaries` AS `d` LEFT JOIN `users` AS `u` ON `d`.`user`=`u`.`id` WHERE `d`.`is_public`=1 AND `d`.`id`=" . $dictionary_to_load . ";";
-
+if ($display_mode != "build") {
     $dbconnection = new PDO('mysql:host=' . DATABASE_SERVERNAME . ';dbname=' . DATABASE_NAME . ';charset=utf8', DATABASE_USERNAME, DATABASE_PASSWORD);
     $dbconnection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     $dbconnection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
     $dbconnection->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
-    try {
-        $queryResults = $dbconnection->prepare($query);
-        $queryResults->execute();
-        if ($queryResults) {
-            if (num_rows($queryResults) === 1) {
-                while ($dict = fetch($queryResults)) {
-                    $dictionary_name = $dict['name'];
-                    $dictionary_creator = $dict['public_name'];
-                    $the_public_dictionary = '{"name":"' . $dict['name'] . '",';
-                    $the_public_dictionary .= '"description":"' . $dict['description'] . '",';
-                    $the_public_dictionary .= '"createdBy":"' . $dict['public_name'] . '",';
-                    $the_public_dictionary .= '"words":' . $dict['words'] . ',';
-                    $the_public_dictionary .= '"settings":{';
-                    $the_public_dictionary .= '"partsOfSpeech":"' . $dict['parts_of_speech'] . '",';
-                    $the_public_dictionary .= '"isComplete":' . (($dict['is_complete'] == 1) ? 'true' : 'false') . '},';
-                    $the_public_dictionary .= '}';
+
+    if ($display_mode == "word") {
+        // only query for specific word.
+        $query = "SELECT `d`.`name` AS `dname`, `u`.`public_name`, `w`.`word_id`, `w`.`name`, `w`.`pronunciation`, `w`.`part_of_speech`, `w`.`simple_definition`, `w`.`long_definition` ";
+        $query .= "FROM `words` AS `w` LEFT JOIN `dictionaries` AS `d` ON `w`.`dictionary`=`d`.`id` ";
+        $query .= "LEFT JOIN `users` AS `u` ON `d`.`user`=`u`.`id` ";
+        $query .= "WHERE `d`.`is_public`=1 AND `w`.`dictionary`=" . $dictionary_to_load . " AND `w`.`word_id`=" . $dictionary_to_load . ";";
+        
+        try {
+            $queryResults = $dbconnection->prepare($query);
+            $queryResults->execute();
+            if ($queryResults) {
+                if (num_rows($queryResults) === 1) {
+                    while ($word = fetch($queryResults)) {
+                        $dictionary_name = $word['dname'];
+                        $dictionary_creator = $word['public_name'];
+                        $the_public_word = '{"name":"' . $word['name'] . '",';
+                        $the_public_word .= '"pronunciation":"' . $word['pronunciation'] . '",';
+                        $the_public_word .= '"partOfSpeech":"' . $word['part_of_speech'] . '",';
+                        $the_public_word .= '"simpleDefinition":"' . $word['simple_definition'] . '",';
+                        $the_public_word .= '"longDefinition":"' . $word['long_definition'] . '",';
+                        $the_public_word .= '"wordId":"' . $word['word_id'] . '"';
+                        $the_public_word .= '}';
+                    }
                 }
             }
         }
+        catch (PDOException $ex) {}
+    } else {
+        // Otherwise, grab everything.
+        $query = "SELECT `d`.`id`, `d`.`name`, `d`.`description`, `u`.`public_name`, `d`.`parts_of_speech`, `d`.`is_complete` ";
+        $query .= "FROM `dictionaries` AS `d` LEFT JOIN `users` AS `u` ON `d`.`user`=`u`.`id` WHERE `d`.`is_public`=1 AND `d`.`id`=" . $dictionary_to_load . ";";
+
+        try {
+            $queryResults = $dbconnection->prepare($query);
+            $queryResults->execute();
+            if ($queryResults) {
+                if (num_rows($queryResults) === 1) {
+                    while ($dict = fetch($queryResults)) {
+                        $dictionary_name = $dict['name'];
+                        $dictionary_creator = $dict['public_name'];
+                        $the_public_dictionary = '{"name":"' . $dict['name'] . '",';
+                        $the_public_dictionary .= '"description":"' . $dict['description'] . '",';
+                        $the_public_dictionary .= '"createdBy":"' . $dict['public_name'] . '",';
+                        $the_public_dictionary .= '"words":' . Get_Dictionary_Words($dictionary_to_load) . ',';
+                        $the_public_dictionary .= '"settings":{';
+                        $the_public_dictionary .= '"partsOfSpeech":"' . $dict['parts_of_speech'] . '",';
+                        $the_public_dictionary .= '"isComplete":' . (($dict['is_complete'] == 1) ? 'true' : 'false') . '},';
+                        $the_public_dictionary .= '}';
+                    }
+                }
+            }
+        }
+        catch (PDOException $ex) {}
     }
-    catch (PDOException $ex) {}
 }
 
 ?>
@@ -65,20 +97,29 @@ if ($is_viewing) {
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     
-    <?php if ($is_viewing) { ?>
-        <title><?php echo $dictionary_name; ?> Dictionary on Lexiconga</title>
-        <meta property="og:url" content="http://lexicon.ga/view/?dict=<?php echo $dictionary_to_load; ?>" />
+    <?php if ($display_mode != "build") { ?>
+        <title><?php echo (($display_mode == "word") ? ($word_name . " | ") : "") . $dictionary_name; ?> Dictionary on Lexiconga</title>
+        <meta property="og:url" content="http://lexicon.ga/<?php echo $dictionary_to_load . (($display_mode == "word") ? ("/" . $word_to_load) : ""); ?>" />
         <meta property="og:type" content="article" />
-        <meta property="og:title" content="<?php echo $dictionary_name; ?> Dictionary" />
+        <meta property="og:title" content="<?php echo (($display_mode == "word") ? ("\"" . $word_name . "\" in the ") : "") . $dictionary_name; ?> Dictionary" />
         <meta property="og:description" content="A Lexiconga dictionary by <?php echo $dictionary_creator; ?>" />
         <meta property="og:image" content="http://lexicon.ga/images/logo.svg" />
-        <script>var publicDictionary = <?php echo $the_public_dictionary; ?></script>
-    <?php } else { ?>
+        <?php if (isset($the_public_word)) { ?>
+            <script>var publicWord = <?php echo $the_public_word; ?></script>
+        <?php } else { ?>
+            <script>var publicDictionary = <?php echo $the_public_dictionary; ?></script>
+    <?php }
+    } else { ?>
         <title>Lexiconga Dictionary Builder</title>
+        <meta property="og:url" content="http://lexicon.ga" />
+        <meta property="og:type" content="website" />
+        <meta property="og:title" content="Lexiconga Dictionary Builder" />
+        <meta property="og:description" content="Build lexicons for contructed languages or anything that you can think of!" />
+        <meta property="og:image" content="http://lexicon.ga/images/logo.svg" />
     <?php } ?>
 
-    <link href="css/styles.css" rel="stylesheet" />
-    <link href="css/lexiconga.css" rel="stylesheet" />
+    <link href="/css/styles.css" rel="stylesheet" />
+    <link href="/css/lexiconga.css" rel="stylesheet" />
 </head>
 <body>
     <header>
@@ -99,7 +140,7 @@ if ($is_viewing) {
         </div>
     </header>
     <contents>
-    <?php if (!$is_viewing) { ?>
+    <?php if ($display_mode == "build") { ?>
     <div id="announcementArea" style="display:<?php echo (($announcement) ? "block" : "none"); ?>;margin-bottom:10px;">
         <span id="announcementCloseButton" class="clickable" onclick="document.getElementById('announcementArea').style.display='none';">Close</span>
         <div id="announcement"><?php echo $announcement; ?></div>
@@ -142,35 +183,36 @@ if ($is_viewing) {
     <?php } ?>
 
     <div id="dictionaryContainer">
-        <?php if (!$is_viewing) { ?>
+        <?php if ($display_mode == "build") { ?>
         <span id="settingsButton" class="clickable" onclick="ShowSettings()">Settings</span>
         <?php } ?>
         <h1 id="dictionaryName"></h1>
 
-        <?php if ($is_viewing) { ?>
+        <?php if ($display_mode == "view") { ?>
         <h4 id="dictionaryBy"></h4>
         <div id="incompleteNotice"></div>
         <?php } ?>
         
-        <span id="descriptionToggle" class="clickable" onclick="ToggleDescription();"><?php if ($is_viewing) { ?>Hide<?php } else { ?>Show<?php } ?> Description</span>
-        <div id="dictionaryDescription" style="display:<?php if ($is_viewing) { ?>block<?php } else { ?>none<?php } ?>;"></div>
+        <span id="descriptionToggle" class="clickable" onclick="ToggleDescription();"><?php if ($display_mode == "view") { ?>Hide<?php } else { ?>Show<?php } ?> Description</span>
+        <div id="dictionaryDescription" style="display:<?php if ($display_mode == "view") { ?>block<?php } else { ?>none<?php } ?>;"></div>
         
-        <span id="searchFilterToggle" class="clickable" onclick="ToggleSearchFilter();"><?php if ($is_viewing) { ?>Hide <?php } ?>Search/Filter Options</span>
-        <div id="searchFilterArea" style="display:<?php if ($is_viewing) { ?>block<?php } else { ?>none<?php } ?>;">
+        <?php if ($display_mode != "word") { ?>
+        <span id="searchFilterToggle" class="clickable" onclick="ToggleSearchFilter();"><?php if ($display_mode == "view") { ?>Hide <?php } ?>Search/Filter Options</span>
+        <div id="searchFilterArea" style="display:<?php if ($display_mode == "view") { ?>block<?php } else { ?>none<?php } ?>;">
             <div id="searchArea" style="display:block;">
                 <label style="margin-top:10px;">
                     <span>Search</span>
                     <div style="display:block;">
-                        <input type="text" id="searchBox" onclick="this.select();" onchange="<?php Show_Dictionary_Function($is_viewing) ?>" style="display:inline;" />&nbsp;
-                        <span class="clickable inline-button" onclick="document.getElementById('searchBox').value='';<?php Show_Dictionary_Function($is_viewing) ?>;">Clear Search</span>
+                        <input type="text" id="searchBox" onclick="this.select();" onchange="<?php Show_Dictionary_Function($display_mode == "view") ?>" style="display:inline;" />&nbsp;
+                        <span class="clickable inline-button" onclick="document.getElementById('searchBox').value='';<?php Show_Dictionary_Function($display_mode == "view") ?>;">Clear Search</span>
                     </div>
                     <div id="searchOptions">
-                        <label class="searchOption">Word <input type="checkbox" id="searchOptionWord" checked="checked" onchange="<?php Show_Dictionary_Function($is_viewing) ?>" /></label>
-                        <label class="searchOption">Equivalent <input type="checkbox" id="searchOptionSimple" checked="checked" onchange="<?php Show_Dictionary_Function($is_viewing) ?>" /></label>
-                        <label class="searchOption">Explanation <input type="checkbox" id="searchOptionLong" checked="checked" onchange="<?php Show_Dictionary_Function($is_viewing) ?>" /></label>
+                        <label class="searchOption">Word <input type="checkbox" id="searchOptionWord" checked="checked" onchange="<?php Show_Dictionary_Function($display_mode == "view") ?>" /></label>
+                        <label class="searchOption">Equivalent <input type="checkbox" id="searchOptionSimple" checked="checked" onchange="<?php Show_Dictionary_Function($display_mode == "view") ?>" /></label>
+                        <label class="searchOption">Explanation <input type="checkbox" id="searchOptionLong" checked="checked" onchange="<?php Show_Dictionary_Function($display_mode == "view") ?>" /></label>
                         <br />
-                        <label class="searchOption">Search Case-Sensitive <input type="checkbox" id="searchCaseSensitive" onchange="<?php Show_Dictionary_Function($is_viewing) ?>" /></label>
-                        <label class="searchOption" title="Note: Matching diacritics will appear but may not highlight.">Ignore Diacritics/Accents <input type="checkbox" id="searchIgnoreDiacritics" onchange="<?php Show_Dictionary_Function($is_viewing) ?>" /></label>
+                        <label class="searchOption">Search Case-Sensitive <input type="checkbox" id="searchCaseSensitive" onchange="<?php Show_Dictionary_Function($display_mode == "view") ?>" /></label>
+                        <label class="searchOption" title="Note: Matching diacritics will appear but may not highlight.">Ignore Diacritics/Accents <input type="checkbox" id="searchIgnoreDiacritics" onchange="<?php Show_Dictionary_Function($display_mode == "view") ?>" /></label>
                     </div>
                 </label>
             </div>
@@ -178,25 +220,28 @@ if ($is_viewing) {
             <label style="display:block;margin-bottom:0;"><b>Filter Words</b></label>
             <div id="filterOptions" style="display:block"></div>
             <div style="display:block;">
-                <span  class="clickable inline-button" onclick="ToggleAllFilters(true);<?php Show_Dictionary_Function($is_viewing) ?>;">
+                <span  class="clickable inline-button" onclick="ToggleAllFilters(true);<?php Show_Dictionary_Function($display_mode == "view") ?>;">
                     Check All
                 </span>
                 &nbsp;
-                <span  class="clickable inline-button" onclick="ToggleAllFilters(false);<?php Show_Dictionary_Function($is_viewing) ?>;">
+                <span  class="clickable inline-button" onclick="ToggleAllFilters(false);<?php Show_Dictionary_Function($display_mode == "view") ?>;">
                     Uncheck All
                 </span>
             </div>
         </div>
         <div id="filterWordCount"></div>
+        <?php } ?>
             
-        <div id="theDictionary"></div>
+        <div id="theDictionary">
+            <?php if ($display_mode == "word") { echo "<script>document.write(DictionaryEntryTemplate(" . $the_public_word . "));</script>"; } ?>
+        </div>
     </div>
     
     <div id="rightColumn" class="googleads" style="float:right;width:20%;max-width:300px;min-width:200px;overflow:hidden;">
         <?php if ($_GET['adminoverride'] != "noadsortracking") { include_once("php/google/adsense.php"); } ?>
     </div>
 
-    <?php if (!$is_viewing) { ?>
+    <?php if ($display_mode == "build") { ?>
 
     <div id="settingsScreen" style="display:none;">
         <div id="settingsBackgroundFade" onclick="HideSettings()"></div>
@@ -326,7 +371,7 @@ if ($is_viewing) {
         }
     ?>
 
-    <?php if (!$is_viewing) { ?>
+    <?php if ($display_mode == "build") { ?>
     <div id="loadAfterDeleteScreen" style="display:none;">
         <div id="loadAfterDeleteFade"></div>
         <div id="loadAfterDeletePage">
@@ -348,27 +393,27 @@ if ($is_viewing) {
     </footer>
     
     <!-- Markdown Parser -->
-    <script src="js/marked.js"></script>
+    <script src="/js/marked.js"></script>
     <!-- CSV Parser -->
-    <script src="js/papaparse.js"></script>
+    <script src="/js/papaparse.js"></script>
     <!-- JSON Search -->
-    <script src="js/defiant.js"></script>
+    <script src="/js/defiant.js"></script>
     <!-- Diacritics Removal for Exports -->
-    <script src="js/removeDiacritics.js"></script>
+    <script src="/js/removeDiacritics.js"></script>
     <!-- Helper Functions -->
-    <script src="js/helpers.js"></script>
+    <script src="/js/helpers.js"></script>
     <!-- Main Functions -->
-    <script src="js/dictionaryBuilder.js"></script>
+    <script src="/js/dictionaryBuilder.js"></script>
     <!-- UI Functions -->
-    <script src="js/ui.js"></script>
-    <?php if ($is_viewing) { ?>
+    <script src="/js/ui.js"></script>
+    <?php if ($display_mode == "view") { ?>
     <!-- Public View Functions -->
-    <script src="js/publicView.js"></script>
+    <script src="/js/publicView.js"></script>
     <?php } ?>
     <?php if ($_GET['adminoverride'] != "noadsortracking") { include_once("php/google/analytics.php"); } ?>
     <script>
     var aboutText = termsText = privacyText = loginForm = forgotForm = importForm = "Loading...";
-    <?php if ($is_viewing) { ?>
+    <?php if ($display_mode == "view") { ?>
     window.onload = function () {
         ShowPublicDictionary();
         SetPublicPartsOfSpeech();
diff --git a/js/dictionaryBuilder.js b/js/dictionaryBuilder.js
index 5e82999..ad29e75 100644
--- a/js/dictionaryBuilder.js
+++ b/js/dictionaryBuilder.js
@@ -176,7 +176,7 @@ function UpdateWord(wordIndex, word, pronunciation, partOfSpeech, simpleDefiniti
 
 function DeleteWord(index) {
     var deleteWord = new XMLHttpRequest();
-    deleteWord.open('POST', "php/ajax_dictionarymanagement.php?action=worddelete");
+    deleteWord.open('POST', "/php/ajax_dictionarymanagement.php?action=worddelete");
     deleteWord.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
     deleteWord.onreadystatechange = function() {
         if (deleteWord.readyState == 4 && deleteWord.status == 200) {
@@ -265,9 +265,6 @@ function ShowDictionary() {
 }
 
 function DictionaryEntry(itemIndex) {
-    displayPublic = (typeof displayPublic !== 'undefined' && displayPublic != null) ? displayPublic : false;
-    var entryText = "<entry id='entry" + itemIndex.toString() + "'><a name='" + currentDictionary.words[itemIndex].wordId + "'></a><a href='#" + currentDictionary.words[itemIndex].wordId + "' class='wordLink clickable'>&#x1f517;</a>";
-    
     var searchTerm = regexParseForSearch(document.getElementById("searchBox").value);
     var searchByWord = document.getElementById("searchOptionWord").checked;
     var searchBySimple = document.getElementById("searchOptionSimple").checked;
@@ -277,61 +274,46 @@ function DictionaryEntry(itemIndex) {
     
     var searchRegEx = new RegExp("(" + ((searchIgnoreDiacritics) ? removeDiacritics(searchTerm) + "|" + searchTerm : searchTerm) + ")", "g" + ((searchIgnoreCase) ? "i" : ""));
 
-    entryText += "<word>";
+    var wordName = wordPronunciation = wordPartOfSpeech = wordSimpleDefinition = wordLongDefinition = "";
 
     if (searchTerm != "" && searchByWord) {
-        entryText += htmlEntitiesParse(currentDictionary.words[itemIndex].name).replace(searchRegEx, "<searchTerm>$1</searchterm>");
+        wordName += htmlEntitiesParse(currentDictionary.words[itemIndex].name).replace(searchRegEx, "<searchTerm>$1</searchterm>");
     } else {
-        entryText += currentDictionary.words[itemIndex].name;
+        wordName += currentDictionary.words[itemIndex].name.toString(); // Use toString() to prevent using a reference instead of the value.
     }
     
-    entryText += "</word>";
-    
     if (currentDictionary.words[itemIndex].pronunciation != "") {
-        entryText += "<pronunciation>";
-        entryText += marked(htmlEntitiesParse(currentDictionary.words[itemIndex].pronunciation)).replace("<p>","").replace("</p>","");
-        entryText += "</pronunciation>";
+        wordPronunciation += marked(htmlEntitiesParse(currentDictionary.words[itemIndex].pronunciation)).replace("<p>","").replace("</p>","");
     }
     
     if (currentDictionary.words[itemIndex].partOfSpeech != "") {
-        entryText += "<partofspeech>";
-        entryText += currentDictionary.words[itemIndex].partOfSpeech;
-        entryText += "</partofspeech>";
+        wordPartOfSpeech += currentDictionary.words[itemIndex].partOfSpeech.toString();
     }
 
-    entryText += "<br>";
-
-    if (currentDictionary.words[itemIndex].simpleDefinition != "") {
-        entryText += "<simpledefinition>";
-        
+    if (currentDictionary.words[itemIndex].simpleDefinition != "") {        
         if (searchTerm != "" && searchBySimple) {
-            entryText += htmlEntitiesParse(currentDictionary.words[itemIndex].simpleDefinition).replace(searchRegEx, "<searchTerm>$1</searchterm>");
+            wordSimpleDefinition += htmlEntitiesParse(currentDictionary.words[itemIndex].simpleDefinition).replace(searchRegEx, "<searchTerm>$1</searchterm>");
         } else {
-            entryText += currentDictionary.words[itemIndex].simpleDefinition;
+            wordSimpleDefinition += currentDictionary.words[itemIndex].simpleDefinition.toString();
         }
-
-        entryText += "</simpledefinition>";
     }
 
     if (currentDictionary.words[itemIndex].longDefinition != "") {
-        entryText += "<longdefinition>";
-
         if (searchTerm != "" && searchByLong) {
-            entryText += marked(htmlEntitiesParse(currentDictionary.words[itemIndex].longDefinition).replace(searchRegEx, "<searchTerm>$1</searchterm>"));
+            wordLongDefinition += marked(htmlEntitiesParse(currentDictionary.words[itemIndex].longDefinition).replace(searchRegEx, "<searchTerm>$1</searchterm>"));
         } else {
-            entryText += marked(htmlEntitiesParse(currentDictionary.words[itemIndex].longDefinition));
+            wordLongDefinition += marked(htmlEntitiesParse(currentDictionary.words[itemIndex].longDefinition));
         }
-
-        entryText += "</longdefinition>";
     }
 
-    if (!currentDictionary.settings.isComplete) {
-        entryText += ManagementArea(itemIndex);
-    }
-
-    entryText += "</entry>";
-
-    return entryText;
+    return DictionaryEntryTemplate({
+        name : wordName,
+        pronunciation : wordPronunciation,
+        partOfSpeech : wordPartOfSpeech,
+        simpleDefinition : wordSimpleDefinition,
+        longDefinition : wordLongDefinition,
+        wordId : currentDictionary.words[itemIndex].wordId.toString()
+    }, (!currentDictionary.settings.isComplete) ? itemIndex : false);
 }
 
 function ManagementArea(itemIndex) {
@@ -350,6 +332,44 @@ function ManagementArea(itemIndex) {
     return managementHTML;
 }
 
+function DictionaryEntryTemplate(wordObject, managementIndex) {
+    managementIndex = (typeof managementIndex !== 'undefined') ? managementIndex : false;
+    var entryText = "<entry id='entry";
+    if (managementIndex !== false) {
+        // If there's a managementIndex, append index number to the element id.
+        entryText += managementIndex.toString();
+    }
+    entryText += "'><a href='#" + wordObject.wordId + "' class='wordLink clickable'>&#x1f517;</a>";
+    
+    entryText += "<word>" + wordObject.name + "</word>";
+    
+    if (wordObject.pronunciation != "") {
+        entryText += "<pronunciation>" + wordObject.pronunciation + "</pronunciation>";
+    }
+    
+    if (wordObject.partOfSpeech != "") {
+        entryText += "<partofspeech>" + wordObject.partOfSpeech + "</partofspeech>";
+    }
+
+    entryText += "<br>";
+
+    if (wordObject.simpleDefinition != "") {
+        entryText += "<simpledefinition>" + wordObject.simpleDefinition + "</simpledefinition>";
+    }
+
+    if (wordObject.longDefinition != "") {
+        entryText += "<longdefinition>" + wordObject.longDefinition + "</longdefinition>";
+    }
+
+    if (managementIndex !== false) {
+        entryText += ManagementArea(managementIndex);
+    }
+
+    entryText += "</entry>";
+
+    return entryText;
+}
+
 function SaveSettings() {
     if (htmlEntities(document.getElementById("dictionaryNameEdit").value) != "") {
         currentDictionary.name = htmlEntities(document.getElementById("dictionaryNameEdit").value);
@@ -395,7 +415,7 @@ function DeleteCurrentDictionary() {
         ResetDictionaryToDefault();
         
         var deleteDictionary = new XMLHttpRequest();
-        deleteDictionary.open('POST', "php/ajax_dictionarymanagement.php?action=delete");
+        deleteDictionary.open('POST', "/php/ajax_dictionarymanagement.php?action=delete");
         deleteDictionary.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
         deleteDictionary.onreadystatechange = function() {
             if (deleteDictionary.readyState == 4 && deleteDictionary.status == 200) {
@@ -439,7 +459,7 @@ function SaveAndUpdateWords(action, wordIndex) {
     }
 
     var sendWords = new XMLHttpRequest();
-    sendWords.open('POST', "php/ajax_dictionarymanagement.php?action=word" + action + "&nextwordid=" + currentDictionary.nextWordId.toString());
+    sendWords.open('POST', "/php/ajax_dictionarymanagement.php?action=word" + action + "&nextwordid=" + currentDictionary.nextWordId.toString());
     sendWords.setRequestHeader("Content-Type", "application/json; charset=UTF-8");
     sendWords.onreadystatechange = function() {
         if (sendWords.readyState == 4 && sendWords.status == 200) {
@@ -501,7 +521,7 @@ function SendDictionary() {
     }
 
     var sendDictionary = new XMLHttpRequest();
-    sendDictionary.open('POST', "php/ajax_dictionarymanagement.php?action=" + action);
+    sendDictionary.open('POST', "/php/ajax_dictionarymanagement.php?action=" + action);
     sendDictionary.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
     sendDictionary.onreadystatechange = function() {
         if (sendDictionary.readyState == 4 && sendDictionary.status == 200) {
@@ -570,7 +590,7 @@ function DataToSend(sendAll) {
 function LoadDictionary() {
     LoadLocalDictionary();
     var loadDictionary = new XMLHttpRequest();
-    loadDictionary.open('GET', "php/ajax_dictionarymanagement.php?action=load");
+    loadDictionary.open('GET', "/php/ajax_dictionarymanagement.php?action=load");
     loadDictionary.onreadystatechange = function() {
         if (loadDictionary.readyState == 4 && loadDictionary.status == 200) {
             if (loadDictionary.responseText == "no dictionaries") {
@@ -594,7 +614,7 @@ function ChangeDictionary(userDictionariesSelect) {
     userDictionariesSelect = (typeof userDictionariesSelect !== 'undefined' && userDictionariesSelect != null) ? userDictionariesSelect : document.getElementById("userDictionaries");
     if (currentDictionary.externalID != userDictionariesSelect.value && userDictionariesSelect.options.length > 0) {
         var changeDictionaryRequest = new XMLHttpRequest();
-        changeDictionaryRequest.open('POST', "php/ajax_dictionarymanagement.php?action=switch");
+        changeDictionaryRequest.open('POST', "/php/ajax_dictionarymanagement.php?action=switch");
         changeDictionaryRequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
         var postString = "newdictionaryid=" + userDictionariesSelect.value.toString();
         changeDictionaryRequest.onreadystatechange = function() {
@@ -775,11 +795,13 @@ function ImportWords() {
     }
 }
 
-function WordIndex(word) {
+function WordIndex(word, byId) {
+// Use byId = true to enter word id number instead of string.
     for (var i = 0; i < currentDictionary.words.length; i++)
     {
-        if ((!currentDictionary.settings.caseSensitive && currentDictionary.words[i].name.toLowerCase() == word.toLowerCase()) ||
-            (currentDictionary.settings.caseSensitive && currentDictionary.words[i].name == word)) {
+        if ((!byId && (!currentDictionary.settings.caseSensitive && currentDictionary.words[i].name.toLowerCase() == word.toLowerCase()) ||
+                (currentDictionary.settings.caseSensitive && currentDictionary.words[i].name == word)) ||
+            (byId && currentDictionary.words[i].wordId == word)) {
             return i;
         }
     }
diff --git a/js/ui.js b/js/ui.js
index 01cc100..6ccf0f3 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -3,12 +3,12 @@ function Initialize() {
     ClearForm();
     LoadUserDictionaries();
     
-    GetTextFile("README.md", "aboutText", true);
-    GetTextFile("TERMS.md", "termsText", true);
-    GetTextFile("PRIVACY.md", "privacyText", true);
-    GetTextFile("LOGIN.form", "loginForm", false);
-    GetTextFile("FORGOT.form", "forgotForm", false);
-    GetTextFile("IMPORT.form", "importForm", false);
+    GetTextFile("/README.md", "aboutText", true);
+    GetTextFile("/TERMS.md", "termsText", true);
+    GetTextFile("/PRIVACY.md", "privacyText", true);
+    GetTextFile("/LOGIN.form", "loginForm", false);
+    GetTextFile("/FORGOT.form", "forgotForm", false);
+    GetTextFile("/IMPORT.form", "importForm", false);
 
     SetKeyboardShortcuts();
 }
@@ -133,7 +133,7 @@ function LoadUserDictionaries() {
     var getDictionariesRequest = new XMLHttpRequest();
     var userDictionariesSelect = document.getElementById("userDictionaries");
     if (userDictionariesSelect != null) {
-        getDictionariesRequest.open('GET', "php/ajax_dictionarymanagement.php?action=getall");
+        getDictionariesRequest.open('GET', "/php/ajax_dictionarymanagement.php?action=getall");
         getDictionariesRequest.onreadystatechange = function() {
             if (getDictionariesRequest.readyState == 4 && getDictionariesRequest.status == 200) {
                 ParseUserDictionariesIntoSelect(userDictionariesSelect, getDictionariesRequest.responseText);
@@ -216,7 +216,7 @@ function ValidateCreateAccount() {
         return false;
     } else {
         var emailCheck = new XMLHttpRequest();
-        emailCheck.open('GET', "php/ajax_createaccountemailcheck.php?email=" + emailValue);
+        emailCheck.open('GET', "/php/ajax_createaccountemailcheck.php?email=" + emailValue);
         emailCheck.onreadystatechange = function() {
             if (emailCheck.readyState == 4 && emailCheck.status == 200) {
                 if (emailCheck.responseText != "ok") {
@@ -262,7 +262,7 @@ function ValidateForgotPassword() {
         return false;
     } else {
         var emailCheck = new XMLHttpRequest();
-        emailCheck.open('GET', "php/ajax_passwordresetemailcheck.php?email=" + emailValue);
+        emailCheck.open('GET', "/php/ajax_passwordresetemailcheck.php?email=" + emailValue);
         emailCheck.onreadystatechange = function() {
             if (emailCheck.readyState == 4 && emailCheck.status == 200) {
                 if (emailCheck.responseText != "email exists") {
@@ -307,7 +307,7 @@ function WarnEmailChange() {
 
 function LoggedInResetPassword() {
     var resetPasswordRequest = new XMLHttpRequest();
-    resetPasswordRequest.open('GET', "php/ajax_setnewpassword.php");
+    resetPasswordRequest.open('GET', "/php/ajax_setnewpassword.php");
     resetPasswordRequest.onreadystatechange = function() {
         if (resetPasswordRequest.readyState == 4 && resetPasswordRequest.status == 200) {
             if (resetPasswordRequest.responseText != "done") {