diff --git a/crossword_puzzle/cword_webapp/templates/index.html b/crossword_puzzle/cword_webapp/templates/index.html
index cb2dc1e1c..7252b306e 100644
--- a/crossword_puzzle/cword_webapp/templates/index.html
+++ b/crossword_puzzle/cword_webapp/templates/index.html
@@ -354,8 +354,7 @@ <h2 class="heading">{{ _('Crossword Puzzle - Game') }}</h2>
             </p>
             {% if failed_insertions > 0 %}
             <p>
-                {{ failed_insertions }} {{ _('word(s) could not be inserted,
-                sorry.') }}
+                {{ failed_insertions }} {{ _('word(s) could not be inserted, sorry.') }}
             </p>
             <p>
                 {{ _('Word count (adjusted)') }}: {{ word_count -
diff --git a/crossword_puzzle/locales/af/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/af/LC_MESSAGES/messages.mo
index 07d6d0280..f04d6fd18 100644
Binary files a/crossword_puzzle/locales/af/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/af/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/af/LC_MESSAGES/messages.po b/crossword_puzzle/locales/af/LC_MESSAGES/messages.po
index 4ec0abab2..ef01f5126 100644
--- a/crossword_puzzle/locales/af/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/af/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: af <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Blokkiesraaisel"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Kyk blokkiesraaisels"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Verlaat die toepassing"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globale instellings"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Tale"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Grootte"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lig"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "donker"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "stelsel"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Voorkoms"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "verskriklik"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "arm"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "gemiddeld"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "groot"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "voltooi"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Blokkiesraaiselkwaliteit"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Blokkiesraaiselblaaier"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Gaan terug"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Laai blokkiesraaisels"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Maak webtoepassing oop"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Beëindig webtoepassing"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Woordtelling voorkeure"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Kies woordtelling"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Pasgemaak"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Om hierdie bewerking uit te voer, moet u eers 'n sel kies."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Beskou"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Naby"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "moeilikheid"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Totale woorde"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Moeilikheid"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Kies"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Begin oor"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Is jy seker jy wil die toepassing herbegin?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Verlaat"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Is jy seker jy wil die program verlaat? As die webtoepassing loop, sal dit "
 "beëindig word."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Terug huistoe"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Is jy seker jy wil teruggaan na die tuisskerm? Die webtoepassing sal "
 "beëindig word."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Fout"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Hierdie taal is reeds gekies."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Hierdie grootte is reeds gekies."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Hierdie voorkoms is reeds gekies."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Hierdie kwaliteit is reeds gekies."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Inligting"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "behoorlik beëindig is nie, kan deur Activity Monitor op MacOS beëindig word,"
 " of, herbegin eenvoudig jou rekenaar om dit te beëindig."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "bestaan. LET WEL: Basiese blokkiesraaiseldata word slegs verkry wanneer die "
 "vertaalde weergawe daarvan nie in die locales-gids voorkom nie."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,107 +238,104 @@ msgstr ""
 "'n Fout het voorgekom in blokkiesraaiselgenerering. Sien asseblief verdere "
 "inligting in die konsole"
 
-msgid "Easy"
-msgstr "Maklik"
-
-msgid "Medium"
-msgstr "Medium"
-
-msgid "Hard"
-msgstr "Hard"
-
-msgid "Extreme"
-msgstr "Ekstreem"
-
-msgid "Geography"
-msgstr "Aardrykskunde"
-
-msgid "Math"
-msgstr "Wiskunde"
-
-msgid "Science"
-msgstr "Wetenskap"
-
-msgid "Computer Science"
-msgstr "Rekenaarwetenskap"
-
-#~ msgid "Capitals"
-#~ msgstr "Hoofletters"
-
-#~ msgid "Countries"
-#~ msgstr "Lande"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Blokkiesraaisel - spel"
 
-#~ msgid "Easy"
-#~ msgstr "Maklik"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Oor"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Af"
 
-#~ msgid "Hard"
-#~ msgstr "Hard"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Onthul"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstreem"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sel"
 
-#~ msgid "Geography"
-#~ msgstr "Aardrykskunde"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Woord"
 
-#~ msgid "Science"
-#~ msgstr "Grootte"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rooster"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Om 'n sel/woord na te gaan of te openbaar, moet jy eers 'n sel kies"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Tjek"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Blokkiesraaisel - Spel"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Helder"
 
-#~ msgid "Across"
-#~ msgstr "Oorkant"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Slim skip"
 
-#~ msgid "Down"
-#~ msgstr "Af"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klik om te zoem"
 
-#~ msgid "Reveal"
-#~ msgstr "Onthul"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "U kyk na"
 
-#~ msgid "Cell"
-#~ msgstr "Sel"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "van"
 
-#~ msgid "Word"
-#~ msgstr "Woord"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Woord (s) kon nie ingevoeg word nie, jammer."
 
-#~ msgid "Grid"
-#~ msgstr "Rooster"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Woordtelling (aangepas)"
 
-#~ msgid "Check"
-#~ msgstr "Tjek"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Woord telling"
 
-#~ msgid "Clear"
-#~ msgstr "Duidelik"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Aanhou"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Slim skip"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "U het die blokkiesraaisel voltooi!"
 
-#~ msgid "Click To Zoom"
-#~ msgstr "Klik om te zoem"
+msgid "Easy"
+msgstr "Maklik"
 
-#~ msgid "You are viewing"
-#~ msgstr "Jy kyk"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "van"
+msgid "Hard"
+msgstr "Hard"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "woord(e) kon nie ingevoeg word nie, jammer."
+msgid "Extreme"
+msgstr "Ekstreem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Woordtelling (aangepas)"
+msgid "Geography"
+msgstr "Aardrykskunde"
 
-#~ msgid "Word count"
-#~ msgstr "Woord telling"
+msgid "Math"
+msgstr "Wiskunde"
 
-#~ msgid "Continue"
-#~ msgstr "Aanhou"
+msgid "Science"
+msgstr "Wetenskap"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Jy het die blokkiesraaisel voltooi!"
+msgid "Computer Science"
+msgstr "Rekenaarwetenskap"
diff --git a/crossword_puzzle/locales/am/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/am/LC_MESSAGES/messages.mo
index b176b9fb3..16117e102 100644
Binary files a/crossword_puzzle/locales/am/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/am/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/am/LC_MESSAGES/messages.po b/crossword_puzzle/locales/am/LC_MESSAGES/messages.po
index 2fd95ea68..1ef0cac54 100644
--- a/crossword_puzzle/locales/am/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/am/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: am <LL@li.org>\n"
@@ -19,188 +19,180 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "የቃላት አቋራጭ እንቆቅልሽ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "መስቀለኛ ቃላትን ተመልከት"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ከመተግበሪያው ውጣ"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ዓለም አቀፍ ቅንብሮች"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ቋንቋዎች"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "መጠን"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ብርሃን"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ጨለማ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ስርዓት"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "መልክ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "አስከፊ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ድሃ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "አማካይ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "በጣም ጥሩ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ፍጹም"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "የቃላት ቃል ጥራት"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "የመስቀል ቃል አሳሽ"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ተመለስ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "መስቀለኛ ቃል ጫን"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "የድር መተግበሪያን ይክፈቱ"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "የድር መተግበሪያን ያቋርጡ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "የቃላት ብዛት ምርጫዎች"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "የቃላት ብዛትን ይምረጡ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "ከፍተኛ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "ብጁ"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ይህንን ክዋኔ ለማከናወን በመጀመሪያ ሴል መምረጥ አለብዎት."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ይመልከቱ"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ገጠመ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ችግር"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ጠቅላላ ቃላት"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "አስቸጋሪ"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ይምረጡ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "እንደገና ጀምር"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "እርግጠኛ ነዎት መተግበሪያውን እንደገና ማስጀመር ይፈልጋሉ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ውጣ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr "እርግጠኛ ነህ ከመተግበሪያው መውጣት ትፈልጋለህ? የድር መተግበሪያ እየሰራ ከሆነ ይቋረጣል።"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ወደ ቤት መመለስ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "እርግጠኛ ነህ ወደ መነሻ ስክሪን መመለስ ትፈልጋለህ? የድር መተግበሪያ ይቋረጣል።"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ስህተት"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ይህ ቋንቋ አስቀድሞ ተመርጧል።"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ይህ መጠን አስቀድሞ ተመርጧል።"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ይህ መልክ አስቀድሞ ተመርጧል።"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ይህ ጥራት አስቀድሞ ተመር is ል."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "መረጃ"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -219,7 +211,7 @@ msgstr ""
 "የመተግበሪያ ሂደቶች በማክኦኤስ ላይ በእንቅስቃሴ መቆጣጠሪያ በኩል ሊቋረጥ ወይም በቀላሉ ኮምፒተርዎን ለማቋረጥ እንደገና "
 "ማስጀመር ይችላሉ።"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -230,123 +222,110 @@ msgstr ""
 " መኖሩን ያረጋግጡ። ማሳሰቢያ፡- የመሠረት መስቀለኛ ቃል ውሂብ የሚደረሰው የተተረጎመው ሥሪት በአካባቢ ማውጫዎች ውስጥ "
 "ከሌለ ብቻ ነው።"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "በቃላት አቋራጭ ትውልድ ላይ ስህተት ተከስቷል። እባክዎ ተጨማሪ መረጃ በኮንሶሉ ውስጥ ይመልከቱ"
 
-msgid "Easy"
-msgstr "ቀላል"
-
-msgid "Medium"
-msgstr "መካከለኛ"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "መሻገሪያ እንቆቅልሽ - ጨዋታ"
 
-msgid "Hard"
-msgstr "ከባድ"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ማዶ"
 
-msgid "Extreme"
-msgstr "ጽንፍ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ወደታች"
 
-msgid "Geography"
-msgstr "ጂኦግራፊ"
-
-msgid "Math"
-msgstr "ሒሳብ"
-
-msgid "Science"
-msgstr "ሳይንስ"
-
-msgid "Computer Science"
-msgstr "የኮምፒውተር ሳይንስ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "መግለጥ"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ህዋስ"
 
-#~ msgid "Capitals"
-#~ msgstr "ዋና ከተማዎች"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "ቃል"
 
-#~ msgid "Countries"
-#~ msgstr "አገሮች"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ፍርግርግ"
 
-#~ msgid "Easy"
-#~ msgstr "ቀላል"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ቼክ"
 
-#~ msgid "Medium"
-#~ msgstr "መካከለኛ"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ማጽዳት"
 
-#~ msgid "Hard"
-#~ msgstr "ከባድ"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ብልህ ዝለል"
 
-#~ msgid "Extreme"
-#~ msgstr "ጽንፍ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ለማጉላት ጠቅ ያድርጉ"
 
-#~ msgid "Geography"
-#~ msgstr "ጂኦግራፊ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "እያዩ ነው"
 
-#~ msgid "Science"
-#~ msgstr "መጠን"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ከ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "ሕዋስ/ቃልን ለመፈተሽ ወይም ለመግለጥ መጀመሪያ ሕዋስ መምረጥ አለቦት"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ቃል (ቶች) ማስገባት, ይቅርታ."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "እንቆቅልሽ - ጨዋታ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "የቃል ቆጠራ (የተስተካከለ)"
 
-#~ msgid "Across"
-#~ msgstr "ማዶ"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "የቃል ቆጠራ"
 
-#~ msgid "Down"
-#~ msgstr "ወደታች"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ቀጥል"
 
-#~ msgid "Reveal"
-#~ msgstr "መግለጥ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "የመቀረት ቃል አጠናቅቀዋል!"
 
-#~ msgid "Cell"
-#~ msgstr "ሕዋስ"
-
-#~ msgid "Word"
-#~ msgstr "ቃል"
-
-#~ msgid "Grid"
-#~ msgstr "ፍርግርግ"
-
-#~ msgid "Check"
-#~ msgstr "ይፈትሹ"
-
-#~ msgid "Clear"
-#~ msgstr "ግልጽ"
-
-#~ msgid "Smart Skip"
-#~ msgstr "ብልህ ዝለል"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ለማጉላት ጠቅ ያድርጉ"
+msgid "Easy"
+msgstr "ቀላል"
 
-#~ msgid "You are viewing"
-#~ msgstr "እየተመለከቱ ነው።"
+msgid "Medium"
+msgstr "መካከለኛ"
 
-#~ msgid "from"
-#~ msgstr "ከ"
+msgid "Hard"
+msgstr "ከባድ"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ቃል(ቶች) ማስገባት አልተቻለም፣ ይቅርታ።"
+msgid "Extreme"
+msgstr "ጽንፍ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "የቃላት ብዛት (የተስተካከለ)"
+msgid "Geography"
+msgstr "ጂኦግራፊ"
 
-#~ msgid "Word count"
-#~ msgstr "የቃላት ብዛት"
+msgid "Math"
+msgstr "ሒሳብ"
 
-#~ msgid "Continue"
-#~ msgstr "ቀጥል"
+msgid "Science"
+msgstr "ሳይንስ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "መስቀለኛ ቃሉን ጨርሰሃል!"
+msgid "Computer Science"
+msgstr "የኮምፒውተር ሳይንስ"
diff --git a/crossword_puzzle/locales/az/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/az/LC_MESSAGES/messages.mo
index 5c0a2abe1..215d88c77 100644
Binary files a/crossword_puzzle/locales/az/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/az/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/az/LC_MESSAGES/messages.po b/crossword_puzzle/locales/az/LC_MESSAGES/messages.po
index 30e0abf97..475aa21bd 100644
--- a/crossword_puzzle/locales/az/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/az/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: az <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krossvord"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Krossvordlara baxın"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Proqramdan çıxın"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Qlobal Parametrlər"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Dillər"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Ölçü"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "işıq"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "qaranlıq"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistemi"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Görünüş"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "dəhşətli"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "yoxsul"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "orta"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "əla"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "mükəmməlləşdirmək"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krossvordun keyfiyyəti"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Krossvord brauzeri"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Qeri gayıt"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Krossvord yükləyin"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Veb tətbiqini açın"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Veb tətbiqini dayandırın"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Söz sayı üstünlükləri"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Söz sayını seçin"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Xüsusi"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Bu əməliyyatı yerinə yetirmək üçün əvvəlcə bir hücrəni seçməlisiniz."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Baxın"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Yaxın"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "çətinlik"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Ümumi sözlər"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Çətinlik"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "seçin"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Yenidən başlamaq"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Proqramı yenidən başlatmaq istədiyinizə əminsiniz?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Çıx"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Tətbiqdən çıxmaq istədiyinizə əminsiniz? Veb tətbiqi işləyirsə, o, "
 "dayandırılacaq."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Evə qayıt"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Əsas ekrana qayıtmaq istədiyinizə əminsiniz? Veb tətbiqi dayandırılacaq."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Xəta"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Bu dil artıq seçilib."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Bu ölçü artıq seçilib."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Bu görünüş artıq seçilib."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Bu keyfiyyət artıq seçilib."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Məlumat"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "prosesləri MacOS-da Fəaliyyət Monitoru vasitəsilə dayandırıla bilər və ya "
 "onları dayandırmaq üçün sadəcə kompüterinizi yenidən başladın."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "Əsas krossvord məlumatı yalnız onun tərcümə edilmiş versiyası yerli dil "
 "kataloqunda olmadıqda əldə edilir."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,118 +237,104 @@ msgstr ""
 "Krossvord yaratmaqda xəta baş verdi. Zəhmət olmasa konsolda əlavə məlumata "
 "baxın"
 
-msgid "Easy"
-msgstr "Asan"
-
-msgid "Medium"
-msgstr "Orta"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krossvord tapmacası - Oyun"
 
-msgid "Hard"
-msgstr "Çətin"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Boyun"
 
-msgid "Extreme"
-msgstr "Ekstremal"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Aşağı"
 
-msgid "Geography"
-msgstr "Coğrafiya"
-
-msgid "Math"
-msgstr "Riyaziyyat"
-
-msgid "Science"
-msgstr "Elm"
-
-msgid "Computer Science"
-msgstr "Kompyuter elmləri"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Aşkar etmək"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Civildəmək"
 
-#~ msgid "Capitals"
-#~ msgstr "Paytaxtlar"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Ərz"
 
-#~ msgid "Countries"
-#~ msgstr "Ölkələr"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Tor"
 
-#~ msgid "Easy"
-#~ msgstr "Asan"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Yoxlamaq"
 
-#~ msgid "Medium"
-#~ msgstr "Orta"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Aydın"
 
-#~ msgid "Hard"
-#~ msgstr "Çətin"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Ağıllı atlama"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstremal"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Böyütmək üçün vurun"
 
-#~ msgid "Geography"
-#~ msgstr "Coğrafiya"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Baxırsan"
 
-#~ msgid "Science"
-#~ msgstr "Ölçü"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "dən"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Hüceyrəni/sözü yoxlamaq və ya aşkar etmək üçün əvvəlcə xana seçməlisiniz"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Söz (lər) əlavə edilə bilməz, bağışlayın."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krossvord Puzzle - Oyun"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Word sayı (tənzimlənir)"
 
-#~ msgid "Across"
-#~ msgstr "Qarşıda"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Söz saymaq"
 
-#~ msgid "Down"
-#~ msgstr "Aşağı"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Davam etmək"
 
-#~ msgid "Reveal"
-#~ msgstr "aşkar etmək"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Krossvord bitirdin!"
 
-#~ msgid "Cell"
-#~ msgstr "Hüceyrə"
-
-#~ msgid "Word"
-#~ msgstr "Söz"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Yoxlayın"
-
-#~ msgid "Clear"
-#~ msgstr "Təmiz"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Ağıllı atlama"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Böyütmək üçün vurun"
+msgid "Easy"
+msgstr "Asan"
 
-#~ msgid "You are viewing"
-#~ msgstr "Baxırsınız"
+msgid "Medium"
+msgstr "Orta"
 
-#~ msgid "from"
-#~ msgstr "-dan"
+msgid "Hard"
+msgstr "Çətin"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "söz(lər)i daxil etmək mümkün olmadı, üzr istəyirik."
+msgid "Extreme"
+msgstr "Ekstremal"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Söz sayı (tənzimlənmiş)"
+msgid "Geography"
+msgstr "Coğrafiya"
 
-#~ msgid "Word count"
-#~ msgstr "Söz sayı"
+msgid "Math"
+msgstr "Riyaziyyat"
 
-#~ msgid "Continue"
-#~ msgstr "Davam et"
+msgid "Science"
+msgstr "Elm"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Krossvordu tamamladın!"
+msgid "Computer Science"
+msgstr "Kompyuter elmləri"
diff --git a/crossword_puzzle/locales/base.pot b/crossword_puzzle/locales/base.pot
index 7996a55b6..9506fb218 100644
--- a/crossword_puzzle/locales/base.pot
+++ b/crossword_puzzle/locales/base.pot
@@ -1,6 +1,6 @@
-# Translations template for PROJECT.
-# Copyright (C) 2024 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
+# Translations template for crossword_puzzle.
+# Copyright (C) 2024 Tomas Vana
+# This file is distributed under the same license as the crossword_puzzle project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
 #, fuzzy
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,188 +17,180 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr ""
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr ""
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr ""
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr ""
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr ""
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr ""
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr ""
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr ""
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr ""
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr ""
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr ""
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr ""
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr ""
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr ""
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr ""
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr ""
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr ""
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr ""
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr ""
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr ""
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr ""
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr ""
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr ""
 
-#: main.py:1078
-msgid "Total words"
-msgstr ""
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr ""
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr ""
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr ""
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr ""
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr ""
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will"
 " be terminated."
 msgstr ""
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr ""
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr ""
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr ""
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr ""
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr ""
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr ""
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr ""
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and "
 "wish to load another one, you must first terminate the web app. "
@@ -211,7 +203,7 @@ msgid ""
 "or, simply restart your computer to terminate them."
 msgstr ""
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that "
 "its definitions JSON file exists in the base cwords directory. NOTE: Base"
@@ -219,12 +211,90 @@ msgid ""
 "present in the locales directory."
 msgstr ""
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information "
 "in the console"
 msgstr ""
 
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr ""
+
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr ""
+
 msgid "Easy"
 msgstr ""
 
diff --git a/crossword_puzzle/locales/be/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/be/LC_MESSAGES/messages.mo
index dc1aabbb4..968ff1761 100644
Binary files a/crossword_puzzle/locales/be/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/be/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/be/LC_MESSAGES/messages.po b/crossword_puzzle/locales/be/LC_MESSAGES/messages.po
index b8d6e9728..205ff1e33 100644
--- a/crossword_puzzle/locales/be/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/be/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: be <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Крыжаванка"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Прагляд крыжаванак"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Выйдзіце з праграмы"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глабальныя налады"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Мовы"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Памер"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "святло"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "цёмны"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "сістэма"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Знешні выгляд"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "жудасны"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "бедны"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "сярэдні"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "вялікі"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "удасканальваць"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Якасць крыжаванкі"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Браўзэр крыжаванак"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Вяртацца"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Спампаваць крыжаванка"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Адкрыйце вэб-прыкладанне"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Спыніць вэб-праграму"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Параметры колькасці слоў"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Выберыце колькасць слоў"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максімум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Прыстасаваныя"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Каб выканаць гэтую аперацыю, неабходна спачатку выбраць вочку."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Выгляд"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Блізка"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "цяжкасць"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Усяго слоў"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Цяжкасць"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Выберыце"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Перазапуск"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Вы ўпэўнены, што хочаце перазапусціць праграму?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Выхад"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Вы ўпэўнены, што хочаце выйсці з праграмы? Калі вэб-праграма працуе, яна "
 "будзе спынена."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Вярнуцца на галоўную"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Вы ўпэўнены, што хочаце вярнуцца на галоўны экран? Вэб-прыкладанне будзе "
 "спынена."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Памылка"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Гэта мова ўжо выбрана."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Гэты памер ужо выбраны."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Гэты знешні выгляд ужо выбраны."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Гэта якасць ужо абрана."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Інфармацыя"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "праз Activity Monitor у MacOS або проста перазагрузіце кампутар, каб спыніць"
 " іх."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "УВАГА: доступ да базавых дадзеных крыжаванак даступны толькі тады, калі іх "
 "перакладзеная версія адсутнічае ў каталогу моў."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Адбылася памылка пры стварэнні крыжаванак. Глядзіце дадатковую інфармацыю ў "
 "кансолі"
 
-msgid "Easy"
-msgstr "лёгка"
-
-msgid "Medium"
-msgstr "Сярэдні"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Крыжаванка - гульня"
 
-msgid "Hard"
-msgstr "Цяжка"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Упоперак"
 
-msgid "Extreme"
-msgstr "Экстрым"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Уніз"
 
-msgid "Geography"
-msgstr "Геаграфія"
-
-msgid "Math"
-msgstr "Матэматыка"
-
-msgid "Science"
-msgstr "Навука"
-
-msgid "Computer Science"
-msgstr "Інфарматыка"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Выяўляць"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Клетка"
 
-#~ msgid "Capitals"
-#~ msgstr "Сталіцы"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Слова"
 
-#~ msgid "Countries"
-#~ msgstr "краіны"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Сетка"
 
-#~ msgid "Easy"
-#~ msgstr "лёгка"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Праверка"
 
-#~ msgid "Medium"
-#~ msgstr "Сярэдні"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Чысціць"
 
-#~ msgid "Hard"
-#~ msgstr "Цяжка"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Разумны прапуск"
 
-#~ msgid "Extreme"
-#~ msgstr "Экстрым"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Націсніце, каб павялічыць маштаб"
 
-#~ msgid "Geography"
-#~ msgstr "Геаграфія"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Вы праглядаеце"
 
-#~ msgid "Science"
-#~ msgstr "Памер"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ад"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Каб праверыць або паказаць ячэйку/слова, трэба спачатку выбраць ячэйку"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Слова (ы) немагчыма ўставіць, прабачце."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Крыжаванка - гульня"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Колькасць слоў (скарэкціраваны)"
 
-#~ msgid "Across"
-#~ msgstr "Папярок"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Колькасць слоў"
 
-#~ msgid "Down"
-#~ msgstr "Уніз"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Працягваць"
 
-#~ msgid "Reveal"
-#~ msgstr "Раскрыць"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Вы завяршылі крыжаванку!"
 
-#~ msgid "Cell"
-#~ msgstr "Сотавы"
-
-#~ msgid "Word"
-#~ msgstr "Слова"
-
-#~ msgid "Grid"
-#~ msgstr "Сетка"
-
-#~ msgid "Check"
-#~ msgstr "Праверыць"
-
-#~ msgid "Clear"
-#~ msgstr "Ясна"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Разумны прапуск"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Націсніце, каб павялічыць маштаб"
+msgid "Easy"
+msgstr "лёгка"
 
-#~ msgid "You are viewing"
-#~ msgstr "Вы праглядаеце"
+msgid "Medium"
+msgstr "Сярэдні"
 
-#~ msgid "from"
-#~ msgstr "ад"
+msgid "Hard"
+msgstr "Цяжка"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "слова(-ы) не можа быць устаўлена, прабачце."
+msgid "Extreme"
+msgstr "Экстрым"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Колькасць слоў (скарэкціравана)"
+msgid "Geography"
+msgstr "Геаграфія"
 
-#~ msgid "Word count"
-#~ msgstr "Колькасць слоў"
+msgid "Math"
+msgstr "Матэматыка"
 
-#~ msgid "Continue"
-#~ msgstr "Працягнуць"
+msgid "Science"
+msgstr "Навука"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Вы завяршылі крыжаванку!"
+msgid "Computer Science"
+msgstr "Інфарматыка"
diff --git a/crossword_puzzle/locales/bg/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/bg/LC_MESSAGES/messages.mo
index 68c267d73..83a4f725b 100644
Binary files a/crossword_puzzle/locales/bg/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/bg/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/bg/LC_MESSAGES/messages.po b/crossword_puzzle/locales/bg/LC_MESSAGES/messages.po
index a7964d983..9d9ec3663 100644
--- a/crossword_puzzle/locales/bg/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/bg/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: bg <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Кръстословица"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Вижте кръстословици"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Излезте от приложението"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобални настройки"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Езици"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Размер"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "светлина"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "тъмно"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "система"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Външен вид"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ужасно"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "беден"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "средно аритметично"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "страхотен"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "Перфектен"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Качество на кръстословието"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Браузър за кръстословици"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Върни се"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Зареди кръстословица"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Отворете уеб приложението"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Прекратете уеб приложението"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Предпочитания за брой думи"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Изберете брой думи"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максимум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Персонализиран"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "За да извършите тази операция, първо трябва да изберете клетка."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Преглед"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Близо"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "трудност"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Общо думи"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Трудност"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Изберете"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Рестартирам"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Сигурни ли сте, че искате да рестартирате приложението?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Изход"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Сигурни ли сте, че искате да излезете от приложението? Ако уеб приложението "
 "работи, то ще бъде прекратено."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Обратно в къщи"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Сигурни ли сте, че искате да се върнете към началния екран? Уеб приложението"
 " ще бъде прекратено."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Грешка"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Този език вече е избран."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Този размер вече е избран."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Този вид вече е избран."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Това качество вече е избрано."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Информация"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "които не са правилно прекратени, могат да бъдат прекратени чрез Activity "
 "Monitor на MacOS или просто рестартирайте компютъра си, за да ги прекратите."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "директория cwords. ЗАБЕЛЕЖКА: Базовите данни за кръстословица са достъпни "
 "само когато нейната преведена версия не присъства в директорията с локали."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Възникна грешка при генерирането на кръстословица. Моля, вижте допълнителна "
 "информация в конзолата"
 
-msgid "Easy"
-msgstr "лесно"
-
-msgid "Medium"
-msgstr "Среден"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Кръстословица - игра"
 
-msgid "Hard"
-msgstr "Твърд"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "През"
 
-msgid "Extreme"
-msgstr "Екстремни"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Надолу"
 
-msgid "Geography"
-msgstr "География"
-
-msgid "Math"
-msgstr "математика"
-
-msgid "Science"
-msgstr "Наука"
-
-msgid "Computer Science"
-msgstr "Информатика"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Разкрие"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Клетка"
 
-#~ msgid "Capitals"
-#~ msgstr "Главни букви"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Дума"
 
-#~ msgid "Countries"
-#~ msgstr "Държави"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Мрежа"
 
-#~ msgid "Easy"
-#~ msgstr "лесно"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Проверете"
 
-#~ msgid "Medium"
-#~ msgstr "Среден"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Ясно"
 
-#~ msgid "Hard"
-#~ msgstr "Твърд"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Екстремни"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Щракнете, за да увеличите мащаба"
 
-#~ msgid "Geography"
-#~ msgstr "География"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Вие гледате"
 
-#~ msgid "Science"
-#~ msgstr "Размер"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "от"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "За да проверите или разкриете клетка/дума, първо трябва да изберете клетка"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Думата (ите) не може да бъде поставена, съжалявам."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Кръстословица - игра"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Брой на думите (коригирано)"
 
-#~ msgid "Across"
-#~ msgstr "През"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Брой думи"
 
-#~ msgid "Down"
-#~ msgstr "Надолу"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "продължи"
 
-#~ msgid "Reveal"
-#~ msgstr "Разкрие"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Завършихте кръстословицата!"
 
-#~ msgid "Cell"
-#~ msgstr "клетка"
-
-#~ msgid "Word"
-#~ msgstr "Слово"
-
-#~ msgid "Grid"
-#~ msgstr "Решетка"
-
-#~ msgid "Check"
-#~ msgstr "Проверете"
-
-#~ msgid "Clear"
-#~ msgstr "ясно"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Щракнете, за да увеличите мащаба"
+msgid "Easy"
+msgstr "лесно"
 
-#~ msgid "You are viewing"
-#~ msgstr "Вие гледате"
+msgid "Medium"
+msgstr "Среден"
 
-#~ msgid "from"
-#~ msgstr "от"
+msgid "Hard"
+msgstr "Твърд"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "дума(и) не можаха да бъдат вмъкнати, съжаляваме."
+msgid "Extreme"
+msgstr "Екстремни"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Брой думи (коригиран)"
+msgid "Geography"
+msgstr "География"
 
-#~ msgid "Word count"
-#~ msgstr "Брой думи"
+msgid "Math"
+msgstr "математика"
 
-#~ msgid "Continue"
-#~ msgstr "продължи"
+msgid "Science"
+msgstr "Наука"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Попълнихте кръстословицата!"
+msgid "Computer Science"
+msgstr "Информатика"
diff --git a/crossword_puzzle/locales/bn/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/bn/LC_MESSAGES/messages.mo
index 13dab4ebb..16c968cc3 100644
Binary files a/crossword_puzzle/locales/bn/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/bn/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/bn/LC_MESSAGES/messages.po b/crossword_puzzle/locales/bn/LC_MESSAGES/messages.po
index 7a92385f5..19d5c620f 100644
--- a/crossword_puzzle/locales/bn/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/bn/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: bn <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "শব্দের ধাঁধা"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ক্রসওয়ার্ড দেখুন"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "অ্যাপ থেকে প্রস্থান করুন"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "গ্লোবাল সেটিংস"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ভাষা"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "আকার"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "আলো"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "অন্ধকার"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "পদ্ধতি"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "চেহারা"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ভয়ানক"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "দরিদ্র"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "গড়"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "দুর্দান্ত"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "নিখুঁত"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ক্রসওয়ার্ড মান"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "ক্রসওয়ার্ড ব্রাউজার"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ফিরে যাও"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ক্রসওয়ার্ড লোড করুন"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ওয়েব অ্যাপ খুলুন"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ওয়েব অ্যাপ বন্ধ করুন"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "শব্দ গণনা পছন্দ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "শব্দ সংখ্যা নির্বাচন করুন"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "সর্বোচ্চ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "কাস্টম"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "এই অপারেশনটি সম্পাদন করতে আপনাকে প্রথমে একটি সেল নির্বাচন করতে হবে।"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "দেখুন"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "বন্ধ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "অসুবিধা"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "মোট শব্দ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "অসুবিধা"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "নির্বাচন করুন"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "আবার শুরু"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "আপনি কি অ্যাপটি পুনরায় চালু করার বিষয়ে নিশ্চিত?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "প্রস্থান করুন"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "আপনি কি অ্যাপ থেকে প্রস্থান করার বিষয়ে নিশ্চিত? ওয়েব অ্যাপটি চলমান থাকলে "
 "তা বন্ধ হয়ে যাবে।"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "বাড়িতে ফিরে যাও"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "আপনি কি নিশ্চিত যে আপনি হোম স্ক্রিনে ফিরে যেতে চান? ওয়েব অ্যাপটি বন্ধ হয়ে "
 "যাবে।"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ত্রুটি"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "এই ভাষাটি ইতিমধ্যেই নির্বাচিত হয়েছে৷"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "এই আকারটি ইতিমধ্যেই নির্বাচিত।"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "এই চেহারা ইতিমধ্যেই নির্বাচিত হয়েছে."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "এই গুণটি ইতিমধ্যে নির্বাচিত হয়েছে।"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "তথ্য"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "সেগুলি MacOS-এ অ্যাক্টিভিটি মনিটরের মাধ্যমে বন্ধ করা যেতে পারে, অথবা, সেগুলি"
 " বন্ধ করতে আপনার কম্পিউটার পুনরায় চালু করুন৷"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,125 +230,111 @@ msgstr ""
 "ক্রসওয়ার্ড ডেটা শুধুমাত্র তখনই অ্যাক্সেস করা হয় যখন এর অনুবাদকৃত সংস্করণ "
 "লোকেল ডিরেক্টরিতে উপস্থিত না থাকে।"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "ক্রসওয়ার্ড তৈরিতে একটি ত্রুটি ঘটেছে৷ অনুগ্রহ করে কনসোলে আরও তথ্য দেখুন"
 
-msgid "Easy"
-msgstr "সহজ"
-
-msgid "Medium"
-msgstr "মধ্যম"
-
-msgid "Hard"
-msgstr "কঠিন"
-
-msgid "Extreme"
-msgstr "চরম"
-
-msgid "Geography"
-msgstr "ভূগোল"
-
-msgid "Math"
-msgstr "গণিত"
-
-msgid "Science"
-msgstr "বিজ্ঞান"
-
-msgid "Computer Science"
-msgstr "কম্পিউটার বিজ্ঞান"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "রাজধানী"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ক্রসওয়ার্ড ধাঁধা - খেলা"
 
-#~ msgid "Countries"
-#~ msgstr "দেশগুলো"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "জুড়ে"
 
-#~ msgid "Easy"
-#~ msgstr "সহজ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "নিচে"
 
-#~ msgid "Medium"
-#~ msgstr "মধ্যম"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "প্রকাশ করা"
 
-#~ msgid "Hard"
-#~ msgstr "কঠিন"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "সেল"
 
-#~ msgid "Extreme"
-#~ msgstr "চরম"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "শব্দ"
 
-#~ msgid "Geography"
-#~ msgstr "ভূগোল"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "গ্রিড"
 
-#~ msgid "Science"
-#~ msgstr "আকার"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "পরীক্ষা করুন"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "একটি ঘর/শব্দ পরীক্ষা বা প্রকাশ করতে, আপনাকে প্রথমে একটি ঘর নির্বাচন করতে হবে"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "পরিষ্কার"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ক্রসওয়ার্ড পাজল - গেম"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "স্মার্ট স্কিপ"
 
-#~ msgid "Across"
-#~ msgstr "জুড়ে"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "জুম ক্লিক করুন"
 
-#~ msgid "Down"
-#~ msgstr "নিচে"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "আপনি দেখছেন"
 
-#~ msgid "Reveal"
-#~ msgstr "প্রকাশ করা"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "থেকে"
 
-#~ msgid "Cell"
-#~ msgstr "সেল"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "শব্দ (গুলি) serted োকানো যায়নি, দুঃখিত।"
 
-#~ msgid "Word"
-#~ msgstr "শব্দ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "শব্দ গণনা (সামঞ্জস্য)"
 
-#~ msgid "Grid"
-#~ msgstr "গ্রিড"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "শব্দ গণনা"
 
-#~ msgid "Check"
-#~ msgstr "চেক করুন"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "চালিয়ে যান"
 
-#~ msgid "Clear"
-#~ msgstr "পরিষ্কার"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "আপনি ক্রসওয়ার্ড শেষ করেছেন!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "স্মার্ট স্কিপ"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "জুম ক্লিক করুন"
+msgid "Easy"
+msgstr "সহজ"
 
-#~ msgid "You are viewing"
-#~ msgstr "আপনি দেখছেন"
+msgid "Medium"
+msgstr "মধ্যম"
 
-#~ msgid "from"
-#~ msgstr "থেকে"
+msgid "Hard"
+msgstr "কঠিন"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "শব্দ(গুলি) সন্নিবেশ করা যায়নি, দুঃখিত।"
+msgid "Extreme"
+msgstr "চরম"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "শব্দ সংখ্যা (সামঞ্জস্য)"
+msgid "Geography"
+msgstr "ভূগোল"
 
-#~ msgid "Word count"
-#~ msgstr "শব্দ গণনা"
+msgid "Math"
+msgstr "গণিত"
 
-#~ msgid "Continue"
-#~ msgstr "চালিয়ে যান"
+msgid "Science"
+msgstr "বিজ্ঞান"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "আপনি ক্রসওয়ার্ড সম্পূর্ণ!"
+msgid "Computer Science"
+msgstr "কম্পিউটার বিজ্ঞান"
diff --git a/crossword_puzzle/locales/bs/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/bs/LC_MESSAGES/messages.mo
index 621ef8f90..83d020149 100644
Binary files a/crossword_puzzle/locales/bs/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/bs/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/bs/LC_MESSAGES/messages.po b/crossword_puzzle/locales/bs/LC_MESSAGES/messages.po
index cd2a627f4..dd954acb8 100644
--- a/crossword_puzzle/locales/bs/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/bs/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: bs <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Ukrštenica"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Pogledaj ukrštene riječi"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Izađite iz aplikacije"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globalne postavke"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Jezici"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Veličina"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "svjetlo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mračno"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Izgled"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "strašan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "loš"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "prosjek"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "sjajan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "savršen"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kvalitet ukrštenom"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Vrati se"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Učitaj ukrštenicu"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Otvorite web aplikaciju"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Ukinite web aplikaciju"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Postavke broja riječi"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Odaberite broj riječi"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Da biste izveli ovu operaciju, prvo morate odabrati ćeliju."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Pogled"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zatvori"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "poteškoće"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Ukupno riječi"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Poteškoće"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Odaberite"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Ponovo pokreni"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Jeste li sigurni da želite ponovo pokrenuti aplikaciju?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Izlaz"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Jeste li sigurni da želite izaći iz aplikacije? Ako je web aplikacija "
 "pokrenuta, bit će ugašena."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Povratak na početnu"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Jeste li sigurni da se želite vratiti na početni ekran? Web aplikacija će "
 "biti ugašena."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Greška"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ovaj jezik je već odabran."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ova veličina je već odabrana."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ovaj izgled je već odabran."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ova kvaliteta je već odabrana."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "Activity Monitora na MacOS-u ili jednostavno ponovo pokrenite računar da "
 "biste ih prekinuli."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 " NAPOMENA: Osnovnim podacima ukrštenih riječi pristupa se samo kada njihova "
 "prevedena verzija nije prisutna u direktoriju lokalizacije."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Došlo je do greške pri generiranju ukrštenih riječi. Molimo pogledajte "
 "dodatne informacije na konzoli"
 
-msgid "Easy"
-msgstr "Lako"
-
-msgid "Medium"
-msgstr "Srednje"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Ukrštena zagonetka - igra"
 
-msgid "Hard"
-msgstr "Teško"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Preko"
 
-msgid "Extreme"
-msgstr "Ekstremno"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Dolje"
 
-msgid "Geography"
-msgstr "Geografija"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Nauka"
-
-msgid "Computer Science"
-msgstr "Računarska nauka"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Otkriti"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ćelija"
 
-#~ msgid "Capitals"
-#~ msgstr "Kapitali"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Reč"
 
-#~ msgid "Countries"
-#~ msgstr "Zemlje"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rešetka"
 
-#~ msgid "Easy"
-#~ msgstr "Lako"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Provjeriti"
 
-#~ msgid "Medium"
-#~ msgstr "Srednje"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Jasan"
 
-#~ msgid "Hard"
-#~ msgstr "Teško"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Preskoči"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstremno"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kliknite za zum"
 
-#~ msgid "Geography"
-#~ msgstr "Geografija"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Vi gledate"
 
-#~ msgid "Science"
-#~ msgstr "Veličina"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "iz"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Da biste provjerili ili otkrili ćeliju/riječ, prvo morate odabrati ćeliju"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Riječ (i) nije se moglo umetnuti, izvini."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Ukrštenica - Igra"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Broj riječi (podešeno)"
 
-#~ msgid "Across"
-#~ msgstr "Preko puta"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Broj riječi"
 
-#~ msgid "Down"
-#~ msgstr "Dole"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Nastaviti"
 
-#~ msgid "Reveal"
-#~ msgstr "Otkrij"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Završili ste ukrštenu reč!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Riječ"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Provjeri"
-
-#~ msgid "Clear"
-#~ msgstr "Jasno"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Preskoči"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kliknite za zum"
+msgid "Easy"
+msgstr "Lako"
 
-#~ msgid "You are viewing"
-#~ msgstr "Vi gledate"
+msgid "Medium"
+msgstr "Srednje"
 
-#~ msgid "from"
-#~ msgstr "od"
+msgid "Hard"
+msgstr "Teško"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "riječ(e) nije moguće umetnuti, izvinite."
+msgid "Extreme"
+msgstr "Ekstremno"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Broj riječi (prilagođeno)"
+msgid "Geography"
+msgstr "Geografija"
 
-#~ msgid "Word count"
-#~ msgstr "Broj riječi"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Nastavi"
+msgid "Science"
+msgstr "Nauka"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Završili ste ukrštenicu!"
+msgid "Computer Science"
+msgstr "Računarska nauka"
diff --git a/crossword_puzzle/locales/ca/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ca/LC_MESSAGES/messages.mo
index f003b9eaa..6591803ac 100644
Binary files a/crossword_puzzle/locales/ca/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ca/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ca/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ca/LC_MESSAGES/messages.po
index 8e2fed3f8..8aa3527a4 100644
--- a/crossword_puzzle/locales/ca/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ca/LC_MESSAGES/messages.po
@@ -1,13 +1,13 @@
-# Catalan translations for PROJECT.
-# Copyright (C) 2024 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
+# Catalan translations for crossword_puzzle.
+# Copyright (C) 2024 Tomas Vana
+# This file is distributed under the same license as the crossword_puzzle project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-19 10:20+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ca <LL@li.org>\n"
@@ -18,147 +18,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Mots encreuats"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Veure mots encreuats"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Sortiu de l'aplicació"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Configuració global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Idiomes"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Mida"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "llum"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "fosc"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aparença"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "terrible"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pobre"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "mitjana"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "gran"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfeccionar"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Qualitat de mots encreuats"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Navegador de mots encreuats"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Torna"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Carregar mots encreuats"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Obre l'aplicació web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Tanca l'aplicació web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferències de recompte de paraules"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Seleccioneu el recompte de paraules"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Màxim"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Personalitzat"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Per realitzar aquesta operació, primer heu de seleccionar una cel·la."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Veure"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Tanca"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "dificultat"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total de paraules"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dificultat"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Seleccioneu"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Reinicia"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Esteu segur que voleu reiniciar l'aplicació?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Sortida"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -166,43 +157,44 @@ msgstr ""
 "Esteu segur que voleu sortir de l'aplicació? Si l'aplicació web s'està "
 "executant, s'acabarà."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "De tornada a casa"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Confirmes que vols tornar a la pantalla d'inici? L'aplicació web es tancarà."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Error"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Aquest idioma ja està seleccionat."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Aquesta mida ja està seleccionada."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Aquesta aparença ja està seleccionada."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Aquesta qualitat ja està seleccionada."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informació"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -224,7 +216,7 @@ msgstr ""
 "finalitzat correctament es poden finalitzar mitjançant Activity Monitor a "
 "MacOS, o simplement reinicieu l'ordinador per finalitzar-los."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -236,7 +228,7 @@ msgstr ""
 "base cwords. NOTA: només s'accedeix a les dades de mots encreuats de base "
 "quan la seva versió traduïda no està present al directori locals."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -244,109 +236,104 @@ msgstr ""
 "S'ha produït un error en la generació de mots encreuats. Consulteu més "
 "informació a la consola"
 
-msgid "Easy"
-msgstr "Fàcil"
-
-msgid "Medium"
-msgstr "Mitjana"
-
-msgid "Hard"
-msgstr "Dur"
-
-msgid "Extreme"
-msgstr "Extrem"
-
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matemàtiques"
-
-msgid "Science"
-msgstr "Ciència"
-
-msgid "Computer Science"
-msgstr "Ciències de la Computació"
-
-#~ msgid "Capitals"
-#~ msgstr "Capitals"
-
-#~ msgid "Countries"
-#~ msgstr "Països"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Trencaclosques de mots encreuats: joc"
 
-#~ msgid "Easy"
-#~ msgstr "Fàcil"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "A través de"
 
-#~ msgid "Medium"
-#~ msgstr "Mitjana"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Sota"
 
-#~ msgid "Hard"
-#~ msgstr "Dur"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Revelar"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cel·la"
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Paraula"
 
-#~ msgid "Science"
-#~ msgstr "Mida"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Graella"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Per comprovar o revelar una cel·la/paraula, primer heu de seleccionar una "
-#~ "cel·la"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Compta"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Mots encreuats - Joc"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Clar"
 
-#~ msgid "Across"
-#~ msgstr "A través de"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Down"
-#~ msgstr "Avall"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Feu clic per fer zoom"
 
-#~ msgid "Reveal"
-#~ msgstr "Revelar"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Esteu veient"
 
-#~ msgid "Cell"
-#~ msgstr "Cèl·lula"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "des de"
 
-#~ msgid "Word"
-#~ msgstr "Paraula"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "No es va poder inserir la paraula (s), ho sento."
 
-#~ msgid "Grid"
-#~ msgstr "Quadrícula"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Recompte de paraules (ajustat)"
 
-#~ msgid "Check"
-#~ msgstr "Comproveu"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Nombre de paraules"
 
-#~ msgid "Clear"
-#~ msgstr "Clar"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continuar"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Has completat el mots encreuats!"
 
-#~ msgid "Click To Zoom"
-#~ msgstr "Feu clic per fer zoom"
+msgid "Easy"
+msgstr "Fàcil"
 
-#~ msgid "You are viewing"
-#~ msgstr "Estàs veient"
+msgid "Medium"
+msgstr "Mitjana"
 
-#~ msgid "from"
-#~ msgstr "des de"
+msgid "Hard"
+msgstr "Dur"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "No s'han pogut inserir paraules, ho sento."
+msgid "Extreme"
+msgstr "Extrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Recompte de paraules (ajustat)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Nombre de paraules"
+msgid "Math"
+msgstr "Matemàtiques"
 
-#~ msgid "Continue"
-#~ msgstr "Continua"
+msgid "Science"
+msgstr "Ciència"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Has completat els mots encreuats!"
+msgid "Computer Science"
+msgstr "Ciències de la Computació"
diff --git a/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.mo
index 78eb2f27b..46353b004 100644
Binary files a/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.po
index db3bbb80b..0727e064f 100644
--- a/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ceb/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ceb <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Tan-awa ang mga crossword"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Paggawas sa app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Mga Setting sa Kalibutan"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Mga pinulongan"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Gidak-on"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "kahayag"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ngitngit"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Panagway"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "mangilngig"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pobre"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "average"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "dako"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "hingpit"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kalidad sa krus"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Balik"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Pag-load sa crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Ablihi ang web app"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Ihunong ang web app"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Mga gusto sa pag-ihap sa pulong"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pagpili sa gidaghanon sa pulong"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Aron mahimo kini nga operasyon, kinahanglan ka una nga magpili usa ka cell."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Panglantaw"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Suod nga"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kalisud"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total nga mga pulong"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Kalisud"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pagpili"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "I-restart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Sigurado ka ba nga gusto nimong i-restart ang app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Paggawas"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,43 +159,44 @@ msgstr ""
 "Sigurado ka nga gusto nimong mugawas sa app? Kung ang web app nagdagan, kini"
 " mahunong."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Balik sa balay"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Sigurado ka ba nga gusto nimong mobalik sa home screen? Ang web app ihunong."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Sayop"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Kini nga pinulongan gipili na."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Kini nga gidak-on gipili na."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Kini nga panagway gipili na."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kini nga kalidad napili na."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Impormasyon"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "tapuson pinaagi sa Activity Monitor sa MacOS, o, i-restart lang ang imong "
 "computer aron tapuson kini."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "directory. PAHINUMDOM: Ang base nga crossword data ma-access lamang kung ang"
 " gihubad nga bersyon niini wala sa direktoryo sa lokal."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "Usa ka sayop ang nahitabo sa crossword generation. Palihug tan-awa ang "
 "dugang nga impormasyon sa console"
 
-msgid "Easy"
-msgstr "Sayon"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle sa crossword - Game"
 
-msgid "Hard"
-msgstr "Lisud"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Tabok"
 
-msgid "Extreme"
-msgstr "Grabe"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Sa ubos"
 
-msgid "Geography"
-msgstr "Geograpiya"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Siyensiya"
-
-msgid "Computer Science"
-msgstr "Computer Science"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Pagpadayag sa"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Selula"
 
-#~ msgid "Capitals"
-#~ msgstr "Mga kapital"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Pulong"
 
-#~ msgid "Countries"
-#~ msgstr "Mga nasud"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Sayon"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Tseke"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Tataw"
 
-#~ msgid "Hard"
-#~ msgstr "Lisud"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Grabe"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Pag-klik sa Zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Geograpiya"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Imong gitan-aw"
 
-#~ msgid "Science"
-#~ msgstr "Gidak-on"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "gikan"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Aron masusi o mapadayag ang usa ka cell/pulong, kinahanglan una kang mopili "
-#~ "ug cell"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ang mga (mga) pulong dili mahimong i-insert, sorry."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Dula"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "WORD COUNT (GIPADAYAG)"
 
-#~ msgid "Across"
-#~ msgstr "Sa tabok"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Pag-ihap sa pulong"
 
-#~ msgid "Down"
-#~ msgstr "Sa ubos"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Magpadayon"
 
-#~ msgid "Reveal"
-#~ msgstr "Pagpadayag sa"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Nahuman nimo ang crossword!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Pulong"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Susiha"
-
-#~ msgid "Clear"
-#~ msgstr "Klaro"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Pag-klik sa Zoom"
+msgid "Easy"
+msgstr "Sayon"
 
-#~ msgid "You are viewing"
-#~ msgstr "Nagtan-aw ka"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "gikan sa"
+msgid "Hard"
+msgstr "Lisud"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "(mga) pulong dili masulod, sorry."
+msgid "Extreme"
+msgstr "Grabe"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Ihap sa pulong (gipasibo)"
+msgid "Geography"
+msgstr "Geograpiya"
 
-#~ msgid "Word count"
-#~ msgstr "Ihap sa pulong"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Padayon"
+msgid "Science"
+msgstr "Siyensiya"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Nakompleto nimo ang crossword!"
+msgid "Computer Science"
+msgstr "Computer Science"
diff --git a/crossword_puzzle/locales/co/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/co/LC_MESSAGES/messages.mo
index 97ad06570..97f8ca17e 100644
Binary files a/crossword_puzzle/locales/co/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/co/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/co/LC_MESSAGES/messages.po b/crossword_puzzle/locales/co/LC_MESSAGES/messages.po
index e15bfd5f2..cdac4761e 100644
--- a/crossword_puzzle/locales/co/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/co/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: co <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Vede i cruciverbi"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Esci da l'app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Settings Global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Lingue"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Taglia"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "luce"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "scuru"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Apparizione"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "terribile"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "Poviru"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Media"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "perfettu"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfettu"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Qualità crucivia"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Browser cruciverba"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Riturnà"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Caricà cruciverba"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Apri l'app web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Termina l'app web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferenze di conte di parolle"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Sceglie u numeru di parolle"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Massimu"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Per fà sta operazione, duvete prima selezziunate una cellula."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Vede"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Chiudi"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "difficultà"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Parulle totale"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Difficultà"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Selezziunà"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Riavvia"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Sò sicuru chì vulete riavvia l'app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Esci"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Sò sicuru chì vulete esce da l'app? Se l'app web hè in esecuzione, serà "
 "terminata."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Torna in casa"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Sò sicuru chì vulete vultà à u screnu in casa ? L'app web serà terminata."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Errore"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Sta lingua hè digià sceltu."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Sta taglia hè digià sceltu."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Stu aspettu hè digià sceltu."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Questa qualità hè digià scelta."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 " sò micca stati terminati bè ponu esse terminati attraversu Activity Monitor"
 " in MacOS, o, simpricimenti, riavvia u vostru urdinatore per finisce."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "cartulare di basa cwords. NOTA: I dati di cruciverba di basa sò accessu solu"
 " quandu a so versione tradutta ùn hè micca presente in u repertoriu locale."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,119 +237,104 @@ msgstr ""
 "Un errore hè accadutu in a generazione di cruciverba. Per piacè vede più "
 "infurmazione in a cunsola"
 
-msgid "Easy"
-msgstr "Facile"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Cruciverba puzzle - ghjocu"
 
-msgid "Hard"
-msgstr "Duru"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Per tutta"
 
-msgid "Extreme"
-msgstr "Estremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Giù"
 
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matematica"
-
-msgid "Science"
-msgstr "Scienza"
-
-msgid "Computer Science"
-msgstr "Informatica"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Revela"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cellula"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitali"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Parolla"
 
-#~ msgid "Countries"
-#~ msgstr "I paesi"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Facile"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Cuntrollu"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "CLEAR"
 
-#~ msgid "Hard"
-#~ msgstr "Duru"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Salute Smart"
 
-#~ msgid "Extreme"
-#~ msgstr "Estremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Cliccate per Zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "VOI VIDE"
 
-#~ msgid "Science"
-#~ msgstr "Taglia"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "da"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Per verificà o revelà una cellula / parola, prima deve selezziunate una "
-#~ "cellula"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "parolle (s) ùn pudia micca esse inserita, scusate."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Ghjocu"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Conte di e parole (aghjustate)"
 
-#~ msgid "Across"
-#~ msgstr "À traversu"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Conta di parolla"
 
-#~ msgid "Down"
-#~ msgstr "Giù"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Cuntinuà"
 
-#~ msgid "Reveal"
-#~ msgstr "Revelà"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Avete completatu a crossword!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Parola"
-
-#~ msgid "Grid"
-#~ msgstr "Griglia"
-
-#~ msgid "Check"
-#~ msgstr "Verificate"
-
-#~ msgid "Clear"
-#~ msgstr "Chjara"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Salute Smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Cliccate per Zoom"
+msgid "Easy"
+msgstr "Facile"
 
-#~ msgid "You are viewing"
-#~ msgstr "Avete vede"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "da"
+msgid "Hard"
+msgstr "Duru"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Parola(e) ùn anu pussutu esse inserite, scusate."
+msgid "Extreme"
+msgstr "Estremo"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Conte di parolle (aghjustatu)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Conte di parolle"
+msgid "Math"
+msgstr "Matematica"
 
-#~ msgid "Continue"
-#~ msgstr "Cuntinuà"
+msgid "Science"
+msgstr "Scienza"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Avete finitu u cruciverba !"
+msgid "Computer Science"
+msgstr "Informatica"
diff --git a/crossword_puzzle/locales/cs/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/cs/LC_MESSAGES/messages.mo
index 7586c543e..66e822625 100644
Binary files a/crossword_puzzle/locales/cs/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/cs/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/cs/LC_MESSAGES/messages.po b/crossword_puzzle/locales/cs/LC_MESSAGES/messages.po
index a300d0083..a5990a1a9 100644
--- a/crossword_puzzle/locales/cs/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/cs/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: cs <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Křížovka"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Zobrazit křížovky"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ukončete aplikaci"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globální nastavení"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Jazyky"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Velikost"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "světlo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "temný"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "Systém"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Vzhled"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "hrozný"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "chudý"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "průměrný"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "skvělý"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfektní"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kvalita křížovky"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Prohlížeč křížovek"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Vraťte se"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Načíst křížovku"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Otevřete webovou aplikaci"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Ukončete webovou aplikaci"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Předvolby počtu slov"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Vyberte počet slov"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Zvyk"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Chcete -li tuto operaci provést, musíte nejprve vybrat buňku."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Pohled"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zavřít"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "obtížnost"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Celkem slov"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Obtížnost"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Vybrat"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Restartujte"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Opravdu chcete aplikaci restartovat?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Výstup"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Opravdu chcete aplikaci ukončit? Pokud je webová aplikace spuštěna, bude "
 "ukončena."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Zpátky domů"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Opravdu se chcete vrátit na domovskou obrazovku? Webová aplikace bude "
 "ukončena."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Chyba"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Tento jazyk je již vybrán."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Tato velikost je již vybrána."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Tento vzhled je již vybrán."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Tato kvalita je již vybrána."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "nebyly řádně ukončeny, lze ukončit pomocí nástroje Activity Monitor v "
 "systému MacOS nebo je ukončit jednoduše restartováním počítače."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,125 +229,111 @@ msgstr ""
 "Data základní křížovky jsou přístupná pouze v případě, že její přeložená "
 "verze není přítomna v adresáři locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "Při generování křížovky došlo k chybě. Další informace naleznete v konzole"
 
-msgid "Easy"
-msgstr "Snadný"
-
-msgid "Medium"
-msgstr "Střední"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Křížovka puzzle - hra"
 
-msgid "Hard"
-msgstr "Tvrdý"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Přes"
 
-msgid "Extreme"
-msgstr "Extrémní"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Dolů"
 
-msgid "Geography"
-msgstr "Zeměpis"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Věda"
-
-msgid "Computer Science"
-msgstr "Počítačová věda"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Odhalit"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Buňka"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitals"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Slovo"
 
-#~ msgid "Countries"
-#~ msgstr "země"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Mřížka"
 
-#~ msgid "Easy"
-#~ msgstr "Snadný"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Šek"
 
-#~ msgid "Medium"
-#~ msgstr "Střední"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Průhledná"
 
-#~ msgid "Hard"
-#~ msgstr "Tvrdý"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Chytré přeskočení"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrémní"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kliknutím na zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Zeměpis"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Sledujete"
 
-#~ msgid "Science"
-#~ msgstr "Velikost"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "z"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Chcete-li zkontrolovat nebo odhalit buňku/slovo, musíte buňku nejprve vybrat"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Slovo (slova) nebylo možné vložit, omlouvám se."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Křížovka - hra"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Počet slov (upraveno)"
 
-#~ msgid "Across"
-#~ msgstr "Přes"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Počet slov"
 
-#~ msgid "Down"
-#~ msgstr "Dolů"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Pokračovat"
 
-#~ msgid "Reveal"
-#~ msgstr "Odhalit"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Dokončili jste křížovku!"
 
-#~ msgid "Cell"
-#~ msgstr "Buňka"
-
-#~ msgid "Word"
-#~ msgstr "Slovo"
-
-#~ msgid "Grid"
-#~ msgstr "Mřížka"
-
-#~ msgid "Check"
-#~ msgstr "Šek"
-
-#~ msgid "Clear"
-#~ msgstr "Průhledná"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Chytré přeskočení"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kliknutím pro přiblížení"
+msgid "Easy"
+msgstr "Snadný"
 
-#~ msgid "You are viewing"
-#~ msgstr "Prohlížíte"
+msgid "Medium"
+msgstr "Střední"
 
-#~ msgid "from"
-#~ msgstr "z"
+msgid "Hard"
+msgstr "Tvrdý"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "slovo(a) nelze vložit, omlouvám se."
+msgid "Extreme"
+msgstr "Extrémní"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Počet slov (upraveno)"
+msgid "Geography"
+msgstr "Zeměpis"
 
-#~ msgid "Word count"
-#~ msgstr "Počet slov"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Pokračovat"
+msgid "Science"
+msgstr "Věda"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Dokončili jste křížovku!"
+msgid "Computer Science"
+msgstr "Počítačová věda"
diff --git a/crossword_puzzle/locales/cy/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/cy/LC_MESSAGES/messages.mo
index 4301d917b..576183665 100644
Binary files a/crossword_puzzle/locales/cy/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/cy/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/cy/LC_MESSAGES/messages.po b/crossword_puzzle/locales/cy/LC_MESSAGES/messages.po
index 446580585..2687ec2c1 100644
--- a/crossword_puzzle/locales/cy/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/cy/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=5; plural=(n==1 ? 1 : n==2 ? 2 : n==3 ? 3 : n==6 ? 4 : 0);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Pos croesair"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Gweld croeseiriau"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Gadael yr app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Gosodiadau Byd-eang"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Ieithoedd"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Maint"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "golau"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tywyll"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "system"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ymddangosiad"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ofnadwy"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "druanaf"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "chyfartaleddwch"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "mawr"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perffeithion"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ansawdd croesair"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Porwr Croesair"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Mynd yn ôl"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Llwytho croesair"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Agor app gwe"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Terfynu ap gwe"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Dewisiadau cyfrif geiriau"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Dewiswch nifer geiriau"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Uchafswm"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "I gyflawni'r llawdriniaeth hon, yn gyntaf rhaid i chi ddewis cell."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Golwg"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Cau"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "anhawster"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Cyfanswm geiriau"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Anhawster"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Dewiswch"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Ail-ddechrau"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ydych chi'n siŵr eich bod am ailgychwyn yr ap?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ymadael"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am adael yr ap? Os yw'r app gwe yn rhedeg, bydd yn"
 " cael ei derfynu."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Yn ôl adref"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ydych chi'n siŵr eich bod am fynd yn ôl i'r sgrin gartref? Bydd yr ap gwe yn"
 " cael ei derfynu."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Gwall"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Mae'r iaith hon eisoes wedi'i dewis."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Mae'r maint hwn eisoes wedi'i ddewis."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Mae'r ymddangosiad hwn eisoes wedi'i ddewis."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Mae'r ansawdd hwn eisoes wedi'i ddewis."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Gwybodaeth"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "wedi'u terfynu'n iawn trwy Activity Monitor ar MacOS, neu, yn syml "
 "ailgychwyn eich cyfrifiadur i'w terfynu."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "Dim ond pan nad yw ei fersiwn wedi'i chyfieithu yn bresennol yn y "
 "cyfeiriadur locales y ceir mynediad i ddata croesair sylfaenol."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,117 +238,104 @@ msgstr ""
 "Digwyddodd gwall wrth gynhyrchu croesair. Gweler rhagor o wybodaeth yn y "
 "consol"
 
-msgid "Easy"
-msgstr "Hawdd"
-
-msgid "Medium"
-msgstr "Canolig"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Pos Croesair - Gêm"
 
-msgid "Hard"
-msgstr "Caled"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Drosodd"
 
-msgid "Extreme"
-msgstr "Eithafol"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "I lawr"
 
-msgid "Geography"
-msgstr "Daearyddiaeth"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Gwyddoniaeth"
-
-msgid "Computer Science"
-msgstr "Cyfrifiadureg"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Amlyger"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Gell"
 
-#~ msgid "Capitals"
-#~ msgstr "Prifddinasoedd"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Eirion"
 
-#~ msgid "Countries"
-#~ msgstr "Gwledydd"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Hawdd"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Wirion"
 
-#~ msgid "Medium"
-#~ msgstr "Canolig"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Gliria ’"
 
-#~ msgid "Hard"
-#~ msgstr "Caled"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Sgip craff"
 
-#~ msgid "Extreme"
-#~ msgstr "Eithafol"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Cliciwch i chwyddo"
 
-#~ msgid "Geography"
-#~ msgstr "Daearyddiaeth"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Rydych chi'n gwylio"
 
-#~ msgid "Science"
-#~ msgstr "Maint"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "oddi wrth"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "I wirio neu ddatgelu cell / gair, rhaid i chi ddewis cell yn gyntaf"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ni ellid mewnosod gair (au), mae'n ddrwg gennyf."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Pos Croesair - Gêm"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Cyfrif geiriau (wedi'i addasu)"
 
-#~ msgid "Across"
-#~ msgstr "Ar draws"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Cyfrif geiriau"
 
-#~ msgid "Down"
-#~ msgstr "I lawr"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Parhawn"
 
-#~ msgid "Reveal"
-#~ msgstr "Datguddia"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Fe wnaethoch chi gwblhau'r croesair!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Gair"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Gwirio"
-
-#~ msgid "Clear"
-#~ msgstr "Clir"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Sgip craff"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Cliciwch i chwyddo"
+msgid "Easy"
+msgstr "Hawdd"
 
-#~ msgid "You are viewing"
-#~ msgstr "Rydych chi'n gwylio"
+msgid "Medium"
+msgstr "Canolig"
 
-#~ msgid "from"
-#~ msgstr "rhag"
+msgid "Hard"
+msgstr "Caled"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ni ellid mewnosod gair(geiriau), mae'n ddrwg gennyf."
+msgid "Extreme"
+msgstr "Eithafol"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Nifer geiriau (wedi'i addasu)"
+msgid "Geography"
+msgstr "Daearyddiaeth"
 
-#~ msgid "Word count"
-#~ msgstr "Cyfrif geiriau"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Parhau"
+msgid "Science"
+msgstr "Gwyddoniaeth"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Fe wnaethoch chi gwblhau'r croesair!"
+msgid "Computer Science"
+msgstr "Cyfrifiadureg"
diff --git a/crossword_puzzle/locales/da/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/da/LC_MESSAGES/messages.mo
index 9dfe019e4..0ac45b2ff 100644
Binary files a/crossword_puzzle/locales/da/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/da/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/da/LC_MESSAGES/messages.po b/crossword_puzzle/locales/da/LC_MESSAGES/messages.po
index a14569396..314841713 100644
--- a/crossword_puzzle/locales/da/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/da/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: da <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kryds og tværs"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Se krydsord"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Afslut appen"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globale indstillinger"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Sprog"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Størrelse"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lys"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mørk"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "system"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Udseende"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "forfærdeligt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "fattige"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "gennemsnit"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "store"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "Perfekt"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krydsordskvalitet"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Krydsord browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Gå tilbage"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Indlæs krydsord"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Åbn webapp"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Afslut webapp"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Ordantal præferencer"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Vælg ordantal"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Brugerdefinerede"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "For at udføre denne operation skal du først vælge en celle."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Udsigt"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Tæt"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "vanskelighed"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Samlede ord"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Vanskelighed"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Vælg"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Genstart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Er du sikker på, at du vil genstarte appen?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Afslut"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Er du sikker på, at du vil afslutte appen? Hvis webappen kører, vil den "
 "blive afsluttet."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Tilbage til hjemmet"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Er du sikker på, at du vil gå tilbage til startskærmen? Webappen vil blive "
 "afsluttet."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Fejl"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Dette sprog er allerede valgt."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Denne størrelse er allerede valgt."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Dette udseende er allerede valgt."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Denne kvalitet er allerede valgt."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "Monitor på MacOS, eller du kan blot genstarte din computer for at afslutte "
 "dem."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 " kun adgang til basiskrydsordsdata, når dens oversatte version ikke findes i"
 " lokalitetsmappen."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Der opstod en fejl i krydsordsgenerering. Se venligst yderligere information"
 " i konsollen"
 
-msgid "Easy"
-msgstr "Let"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krydsord puslespil - spil"
 
-msgid "Hard"
-msgstr "Hårdt"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Et kors"
 
-msgid "Extreme"
-msgstr "Ekstrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ned"
 
-msgid "Geography"
-msgstr "Geografi"
-
-msgid "Math"
-msgstr "Matematik"
-
-msgid "Science"
-msgstr "Videnskab"
-
-msgid "Computer Science"
-msgstr "Computer videnskab"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Løfte sløret"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Celle"
 
-#~ msgid "Capitals"
-#~ msgstr "Hovedstæder"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Ord"
 
-#~ msgid "Countries"
-#~ msgstr "lande"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Gitter"
 
-#~ msgid "Easy"
-#~ msgstr "Let"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrollere"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Klar"
 
-#~ msgid "Hard"
-#~ msgstr "Hårdt"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klik for at zoome"
 
-#~ msgid "Geography"
-#~ msgstr "Geografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Du ser"
 
-#~ msgid "Science"
-#~ msgstr "Størrelse"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "fra"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "For at kontrollere eller afsløre en celle/et ord skal du først vælge en "
-#~ "celle"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ord (er) kunne ikke indsættes, undskyld."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krydsord - Spil"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Ordtælling (justeret)"
 
-#~ msgid "Across"
-#~ msgstr "Et kors"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Ordtælling"
 
-#~ msgid "Down"
-#~ msgstr "ned"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Blive ved"
 
-#~ msgid "Reveal"
-#~ msgstr "Løfte sløret"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Du afsluttede krydsordet!"
 
-#~ msgid "Cell"
-#~ msgstr "Celle"
-
-#~ msgid "Word"
-#~ msgstr "Ord"
-
-#~ msgid "Grid"
-#~ msgstr "Gitter"
-
-#~ msgid "Check"
-#~ msgstr "Kontrollere"
-
-#~ msgid "Clear"
-#~ msgstr "Klar"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klik for at zoome"
+msgid "Easy"
+msgstr "Let"
 
-#~ msgid "You are viewing"
-#~ msgstr "Du ser"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "fra"
+msgid "Hard"
+msgstr "Hårdt"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ord kunne ikke indsættes, beklager."
+msgid "Extreme"
+msgstr "Ekstrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Ordantal (justeret)"
+msgid "Geography"
+msgstr "Geografi"
 
-#~ msgid "Word count"
-#~ msgstr "Ordantal"
+msgid "Math"
+msgstr "Matematik"
 
-#~ msgid "Continue"
-#~ msgstr "Blive ved"
+msgid "Science"
+msgstr "Videnskab"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Du har fuldført krydsordet!"
+msgid "Computer Science"
+msgstr "Computer videnskab"
diff --git a/crossword_puzzle/locales/de/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/de/LC_MESSAGES/messages.mo
index 21f972951..d9d6e8e56 100644
Binary files a/crossword_puzzle/locales/de/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/de/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/de/LC_MESSAGES/messages.po b/crossword_puzzle/locales/de/LC_MESSAGES/messages.po
index fe1f8a45f..71c79a015 100644
--- a/crossword_puzzle/locales/de/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/de/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: de <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kreuzworträtsel"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Kreuzworträtsel anzeigen"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Beenden Sie die App"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globale Einstellungen"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Sprachen"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Größe"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "Licht"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "dunkel"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "System"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aussehen"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "schrecklich"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "arm"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Durchschnitt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Großartig"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfekt"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kreuzworträtselqualität"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Kreuzworträtsel-Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Geh zurück"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Kreuzworträtsel laden"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Web-App öffnen"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Web-App beenden"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Einstellungen für die Wortanzahl"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Wortanzahl auswählen"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximal"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Brauch"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Um diesen Vorgang auszuführen, müssen Sie zuerst eine Zelle auswählen."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Sicht"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Schließen"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "Schwierigkeit"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Gesamtzahl der Wörter"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Schwierigkeit"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Wählen"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Neu starten"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Möchten Sie die App wirklich neu starten?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ausfahrt"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,11 +159,11 @@ msgstr ""
 "Möchten Sie die App wirklich beenden? Wenn die Web-App ausgeführt wird, wird"
 " sie beendet."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Zurück nach Hause"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -180,32 +171,33 @@ msgstr ""
 "Möchten Sie wirklich zum Startbildschirm zurückkehren? Die Web-App wird "
 "beendet."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Fehler"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Diese Sprache ist bereits ausgewählt."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Diese Größe ist bereits ausgewählt."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Dieses Erscheinungsbild ist bereits ausgewählt."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Diese Qualität ist bereits ausgewählt."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Die Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 " können über den Aktivitätsmonitor unter MacOS beendet werden, oder starten "
 "Sie einfach Ihren Computer neu, um sie zu beenden."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -241,7 +233,7 @@ msgstr ""
 "Kreuzworträtseldaten erfolgt nur, wenn die übersetzte Version nicht im "
 "Verzeichnis „locales“ vorhanden ist."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -249,119 +241,104 @@ msgstr ""
 "Bei der Erstellung des Kreuzworträtsels ist ein Fehler aufgetreten. Weitere "
 "Informationen finden Sie in der Konsole"
 
-msgid "Easy"
-msgstr "Einfach"
-
-msgid "Medium"
-msgstr "Mittel"
-
-msgid "Hard"
-msgstr "Hart"
-
-msgid "Extreme"
-msgstr "Extrem"
-
-msgid "Geography"
-msgstr "Erdkunde"
-
-msgid "Math"
-msgstr "Mathematik"
-
-msgid "Science"
-msgstr "Wissenschaft"
-
-msgid "Computer Science"
-msgstr "Informatik"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Hauptstädte"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Kreuzworträtsel - Spiel"
 
-#~ msgid "Countries"
-#~ msgstr "Länder"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Über"
 
-#~ msgid "Easy"
-#~ msgstr "Einfach"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Runter"
 
-#~ msgid "Medium"
-#~ msgstr "Mittel"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Aufdecken"
 
-#~ msgid "Hard"
-#~ msgstr "Hart"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Zelle"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Wort"
 
-#~ msgid "Geography"
-#~ msgstr "Erdkunde"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Netz"
 
-#~ msgid "Science"
-#~ msgstr "Größe"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Überprüfen"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Um eine Zelle/ein Wort zu überprüfen oder anzuzeigen, müssen Sie zunächst "
-#~ "eine Zelle auswählen"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Klar"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Kreuzworträtsel - Spiel"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Across"
-#~ msgstr "Über"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klicken Sie zum Zoom"
 
-#~ msgid "Down"
-#~ msgstr "Runter"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Sie sehen"
 
-#~ msgid "Reveal"
-#~ msgstr "Aufdecken"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "aus"
 
-#~ msgid "Cell"
-#~ msgstr "Zelle"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Wörter konnten nicht eingefügt werden, sorry."
 
-#~ msgid "Word"
-#~ msgstr "Wort"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Wortzahl (angepasst)"
 
-#~ msgid "Grid"
-#~ msgstr "Netz"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Wortzahl"
 
-#~ msgid "Check"
-#~ msgstr "Überprüfen"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Weitermachen"
 
-#~ msgid "Clear"
-#~ msgstr "Klar"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Sie haben das Kreuzworträtsel abgeschlossen!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klicken Sie, um Zoom zu zoomen"
+msgid "Easy"
+msgstr "Einfach"
 
-#~ msgid "You are viewing"
-#~ msgstr "Sie sehen gerade"
+msgid "Medium"
+msgstr "Mittel"
 
-#~ msgid "from"
-#~ msgstr "aus"
+msgid "Hard"
+msgstr "Hart"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Wort(e) konnten leider nicht eingefügt werden."
+msgid "Extreme"
+msgstr "Extrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Wortanzahl (angepasst)"
+msgid "Geography"
+msgstr "Erdkunde"
 
-#~ msgid "Word count"
-#~ msgstr "Wortzahl"
+msgid "Math"
+msgstr "Mathematik"
 
-#~ msgid "Continue"
-#~ msgstr "Weitermachen"
+msgid "Science"
+msgstr "Wissenschaft"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Du hast das Kreuzworträtsel gelöst!"
+msgid "Computer Science"
+msgstr "Informatik"
diff --git a/crossword_puzzle/locales/el/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/el/LC_MESSAGES/messages.mo
index 5517077d5..38ad9c05c 100644
Binary files a/crossword_puzzle/locales/el/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/el/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/el/LC_MESSAGES/messages.po b/crossword_puzzle/locales/el/LC_MESSAGES/messages.po
index 5a22da03a..c8732f6d2 100644
--- a/crossword_puzzle/locales/el/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/el/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: el <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Σταυρόλεξο"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Δείτε σταυρόλεξα"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Έξοδος από την εφαρμογή"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Γενικές ρυθμίσεις"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Γλώσσες"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "φως"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "σκοτάδι"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "Σύστημα"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Εμφάνιση"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "τρομερός"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "Φτωχός"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "μέση τιμή"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "εξαιρετική"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "τέλειος"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ποιότητα δράσης"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Πρόγραμμα περιήγησης σταυρόλεξων"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Πήγαινε πίσω"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Φόρτωση σταυρόλεξου"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Ανοίξτε την εφαρμογή Ιστού"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Τερματισμός εφαρμογής Ιστού"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Προτιμήσεις καταμέτρησης λέξεων"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Επιλέξτε μέτρηση λέξεων"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Ανώτατο όριο"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Εθιμο"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Για να εκτελέσετε αυτήν τη λειτουργία, πρέπει πρώτα να επιλέξετε ένα κελί."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Θέα"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Κλείσε"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "δυσκολία"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Σύνολο λέξεων"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Δυσκολία"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Επιλέγω"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Είστε βέβαιοι ότι θέλετε να επανεκκινήσετε την εφαρμογή;"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Εξοδος"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,11 +159,11 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε να βγείτε από την εφαρμογή; Εάν η εφαρμογή Ιστού "
 "εκτελείται, θα τερματιστεί."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Πίσω στο σπίτι"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -180,32 +171,33 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε να επιστρέψετε στην αρχική οθόνη; Η εφαρμογή Ιστού "
 "θα τερματιστεί."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Λάθος"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Αυτή η γλώσσα είναι ήδη επιλεγμένη."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Αυτό το μέγεθος είναι ήδη επιλεγμένο."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Αυτή η εμφάνιση είναι ήδη επιλεγμένη."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Αυτή η ποιότητα έχει ήδη επιλεγεί."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Πληροφορίες"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 "τερματιστούν μέσω του Activity Monitor σε MacOS ή απλά επανεκκινήστε τον "
 "υπολογιστή σας για να τις τερματίσετε."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "cwords. ΣΗΜΕΙΩΣΗ: Η πρόσβαση στα βασικά σταυρόλεξα γίνεται μόνο όταν η "
 "μεταφρασμένη τους έκδοση δεν υπάρχει στον κατάλογο τοπικών ρυθμίσεων."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Παρουσιάστηκε σφάλμα στη δημιουργία σταυρόλεξων. Δείτε περισσότερες "
 "πληροφορίες στην κονσόλα"
 
-msgid "Easy"
-msgstr "Ανετα"
-
-msgid "Medium"
-msgstr "Μεσαίο"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Σταυρώνα παζλ - Παιχνίδι"
 
-msgid "Hard"
-msgstr "Σκληρά"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Απέναντι"
 
-msgid "Extreme"
-msgstr "Ακρο"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Κάτω"
 
-msgid "Geography"
-msgstr "Γεωγραφία"
-
-msgid "Math"
-msgstr "Μαθηματικά"
-
-msgid "Science"
-msgstr "Επιστήμη"
-
-msgid "Computer Science"
-msgstr "Επιστήμη των υπολογιστών"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Αποκαλύπτω"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Κύτταρο"
 
-#~ msgid "Capitals"
-#~ msgstr "Κεφάλαια"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Λέξη"
 
-#~ msgid "Countries"
-#~ msgstr "Χώρες"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Πλέγμα"
 
-#~ msgid "Easy"
-#~ msgstr "Ανετα"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Ελεγχος"
 
-#~ msgid "Medium"
-#~ msgstr "Μεσαίο"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Σαφή"
 
-#~ msgid "Hard"
-#~ msgstr "Σκληρά"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Έξυπνο"
 
-#~ msgid "Extreme"
-#~ msgstr "Ακρο"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Κάντε κλικ για μεγέθυνση"
 
-#~ msgid "Geography"
-#~ msgstr "Γεωγραφία"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Βλέπετε"
 
-#~ msgid "Science"
-#~ msgstr "Μέγεθος"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "από"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Για να ελέγξετε ή να αποκαλύψετε ένα κελί/λέξη, πρέπει πρώτα να επιλέξετε "
-#~ "ένα κελί"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Οι λέξη δεν μπόρεσαν να εισαχθούν, συγνώμη."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Σταυρόλεξο - Παιχνίδι"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Μέτρηση λέξεων (προσαρμοσμένη)"
 
-#~ msgid "Across"
-#~ msgstr "Απέναντι"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Καταμέτρηση λέξεων"
 
-#~ msgid "Down"
-#~ msgstr "Κάτω"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Να συνεχίσει"
 
-#~ msgid "Reveal"
-#~ msgstr "Αποκαλύπτω"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ολοκληρώσατε το σταυρόλεξο!"
 
-#~ msgid "Cell"
-#~ msgstr "Κύτταρο"
-
-#~ msgid "Word"
-#~ msgstr "Λέξη"
-
-#~ msgid "Grid"
-#~ msgstr "Πλέγμα"
-
-#~ msgid "Check"
-#~ msgstr "Ελεγχος"
-
-#~ msgid "Clear"
-#~ msgstr "Σαφή"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Έξυπνο"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Κάντε κλικ για μεγέθυνση"
+msgid "Easy"
+msgstr "Ανετα"
 
-#~ msgid "You are viewing"
-#~ msgstr "Βλέπετε"
+msgid "Medium"
+msgstr "Μεσαίο"
 
-#~ msgid "from"
-#~ msgstr "από"
+msgid "Hard"
+msgstr "Σκληρά"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Δεν μπόρεσε να εισαχθεί λέξη(εις), συγγνώμη."
+msgid "Extreme"
+msgstr "Ακρο"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Πλήθος λέξεων (προσαρμοσμένο)"
+msgid "Geography"
+msgstr "Γεωγραφία"
 
-#~ msgid "Word count"
-#~ msgstr "Καταμέτρηση λέξεων"
+msgid "Math"
+msgstr "Μαθηματικά"
 
-#~ msgid "Continue"
-#~ msgstr "Να συνεχίσει"
+msgid "Science"
+msgstr "Επιστήμη"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Συμπλήρωσες το σταυρόλεξο!"
+msgid "Computer Science"
+msgstr "Επιστήμη των υπολογιστών"
diff --git a/crossword_puzzle/locales/en/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/en/LC_MESSAGES/messages.mo
index b37e68b09..78ed4ec28 100644
Binary files a/crossword_puzzle/locales/en/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/en/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/en/LC_MESSAGES/messages.po b/crossword_puzzle/locales/en/LC_MESSAGES/messages.po
index f42819210..e7b21ee3d 100644
--- a/crossword_puzzle/locales/en/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -19,188 +19,180 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr ""
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr ""
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr ""
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr ""
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr ""
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr ""
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr ""
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr ""
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr ""
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr ""
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr ""
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr ""
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr ""
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr ""
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr ""
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr ""
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr ""
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr ""
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr ""
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr ""
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr ""
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr ""
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr ""
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr ""
 
-#: main.py:1078
-msgid "Total words"
-msgstr ""
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr ""
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr ""
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr ""
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr ""
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr ""
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr ""
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr ""
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr ""
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr ""
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr ""
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr ""
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr ""
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr ""
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -213,7 +205,7 @@ msgid ""
 "computer to terminate them."
 msgstr ""
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -221,143 +213,110 @@ msgid ""
 "in the locales directory."
 msgstr ""
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 
-msgid "Easy"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
 msgstr ""
 
-msgid "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
 msgstr ""
 
-msgid "Hard"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
 msgstr ""
 
-msgid "Extreme"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
 msgstr ""
 
-msgid "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
 msgstr ""
 
-msgid "Math"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
 msgstr ""
 
-msgid "Science"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
 msgstr ""
 
-msgid "Computer Science"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
 msgstr ""
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "🌐 Languages"
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr ""
-
-#~ msgid "Countries"
-#~ msgstr ""
-
-#~ msgid "Easy"
-#~ msgstr ""
-
-#~ msgid "Medium"
-#~ msgstr ""
-
-#~ msgid "Hard"
-#~ msgstr ""
-
-#~ msgid "Extreme"
-#~ msgstr ""
-
-#~ msgid "Geography"
-#~ msgstr ""
-
-#~ msgid "Scienc"
-#~ msgstr ""
-
-#~ msgid "Science"
-#~ msgstr ""
-
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-
-#~ msgid "To clear the current word, you must first select a cell."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "First time launch, please read: Once you have loaded a crossword, and wish "
-#~ "to load another one, you must first terminate the web app. IMPORTANT: If you"
-#~ " are on macOS, force quitting the application (using cmd+q) while the web "
-#~ "app is running will prevent it from properly terminating. If you mistakenly "
-#~ "do this, either find the Flask app process and terminate it, change the "
-#~ "`webapp_port` number in src/config.ini, or restart your computer. ALSO "
-#~ "IMPORTANT: In some cases, you may have launched the web app yet your browser"
-#~ " cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr ""
 
-#~ msgid "Across"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr ""
 
-#~ msgid "Down"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr ""
 
-#~ msgid "Reveal"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr ""
 
-#~ msgid "Cell"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr ""
 
-#~ msgid "Word"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr ""
 
-#~ msgid "Grid"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr ""
 
-#~ msgid "Check"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr ""
 
-#~ msgid "Clear"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr ""
 
-#~ msgid "Smart Skip"
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr ""
 
-#~ msgid "Click To Zoom"
-#~ msgstr ""
+msgid "Easy"
+msgstr ""
 
-#~ msgid "You are viewing"
-#~ msgstr ""
+msgid "Medium"
+msgstr ""
 
-#~ msgid "from"
-#~ msgstr ""
+msgid "Hard"
+msgstr ""
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr ""
+msgid "Extreme"
+msgstr ""
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr ""
+msgid "Geography"
+msgstr ""
 
-#~ msgid "Word count"
-#~ msgstr ""
+msgid "Math"
+msgstr ""
 
-#~ msgid "Continue"
-#~ msgstr ""
+msgid "Science"
+msgstr ""
 
-#~ msgid "You completed the crossword!"
-#~ msgstr ""
+msgid "Computer Science"
+msgstr ""
diff --git a/crossword_puzzle/locales/eo/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/eo/LC_MESSAGES/messages.mo
index f83ee2261..c4cbeda04 100644
Binary files a/crossword_puzzle/locales/eo/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/eo/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/eo/LC_MESSAGES/messages.po b/crossword_puzzle/locales/eo/LC_MESSAGES/messages.po
index e6a7dbbd0..819bd0785 100644
--- a/crossword_puzzle/locales/eo/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/eo/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: eo <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krucvortenigmo"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Rigardu krucvortojn"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Eliru la apon"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Tutmondaj Agordoj"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Lingvoj"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Grandeco"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lumo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "malhela"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistemo"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "Terura"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "Kompatinda"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "averaĝa"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "bonega"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfekta"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krucvorta kvalito"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Krucvorta Retumilo"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Reiru"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Ŝargi krucvorton"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Malfermu TTT-aplikaĵon"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Ĉesigi TTT-aplikaĵon"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Vortkalkulaj preferoj"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Elektu vortkalkulon"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimumo"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Kutimo"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Por plenumi ĉi tiun operacion, vi devas unue elekti ĉelon."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Vido"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Fermu"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "malfacileco"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Tutaj vortoj"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Malfacilo"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Elektu"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Rekomenci"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ĉu vi certas, ke vi volas rekomenci la apon?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Eliro"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ĉu vi certas, ke vi volas eliri la apon? Se la retejo funkcias, ĝi estos "
 "ĉesigita."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Reen hejmen"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ĉu vi certas, ke vi volas reiri al la hejma ekrano? La TTT-apliko estos "
 "ĉesigita."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Eraro"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ĉi tiu lingvo jam estas elektita."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ĉi tiu grandeco jam estas elektita."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ĉi tiu aspekto jam estas elektita."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ĉi tiu kvalito estas jam elektita."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "kiuj ne estis ĝuste finitaj, povas esti ĉesigitaj per Activity Monitor en "
 "MacOS, aŭ simple rekomenci vian komputilon por ĉesigi ilin."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "krucvortaj datumoj estas alireblaj nur kiam ĝia tradukita versio ne ĉeestas "
 "en la dosierujo de lokaj."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,117 +237,104 @@ msgstr ""
 "Okazis eraro en krucvortgenerado. Bonvolu vidi pliajn informojn en la "
 "konzolo"
 
-msgid "Easy"
-msgstr "Facila"
-
-msgid "Medium"
-msgstr "Meza"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krucvorta Puzlo - Ludo"
 
-msgid "Hard"
-msgstr "Malfacile"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Trans"
 
-msgid "Extreme"
-msgstr "Ekstrema"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Malsupren"
 
-msgid "Geography"
-msgstr "Geografio"
-
-msgid "Math"
-msgstr "Matematiko"
-
-msgid "Science"
-msgstr "Scienco"
-
-msgid "Computer Science"
-msgstr "Komputiko"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Malkaŝi"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ĉelo"
 
-#~ msgid "Capitals"
-#~ msgstr "Ĉefurboj"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Vorto"
 
-#~ msgid "Countries"
-#~ msgstr "Landoj"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Krado"
 
-#~ msgid "Easy"
-#~ msgstr "Facila"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrolu"
 
-#~ msgid "Medium"
-#~ msgstr "Meza"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Klara"
 
-#~ msgid "Hard"
-#~ msgstr "Malfacile"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstrema"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Alklaku por zomi"
 
-#~ msgid "Geography"
-#~ msgstr "Geografio"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Vi spektas"
 
-#~ msgid "Science"
-#~ msgstr "Grandeco"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "de"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Por kontroli aŭ malkaŝi ĉelon/vorton, vi unue devas elekti ĉelon"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Vorto (j) ne povus esti enmetita, pardonu."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krucvortenigmo - Ludo"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Vorto -Kalkulo (Alĝustigita)"
 
-#~ msgid "Across"
-#~ msgstr "Transe"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Sumo da vortoj"
 
-#~ msgid "Down"
-#~ msgstr "Malsupren"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Daŭrigu"
 
-#~ msgid "Reveal"
-#~ msgstr "Malkaŝi"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Vi kompletigis la krucvorton!"
 
-#~ msgid "Cell"
-#~ msgstr "Ĉelo"
-
-#~ msgid "Word"
-#~ msgstr "Vorto"
-
-#~ msgid "Grid"
-#~ msgstr "Krado"
-
-#~ msgid "Check"
-#~ msgstr "Kontrolu"
-
-#~ msgid "Clear"
-#~ msgstr "Klara"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Alklaku por zomi"
+msgid "Easy"
+msgstr "Facila"
 
-#~ msgid "You are viewing"
-#~ msgstr "Vi rigardas"
+msgid "Medium"
+msgstr "Meza"
 
-#~ msgid "from"
-#~ msgstr "de"
+msgid "Hard"
+msgstr "Malfacile"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "vorto(j) ne eblis enmeti, pardonu."
+msgid "Extreme"
+msgstr "Ekstrema"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Vortkalkulo (alĝustigita)"
+msgid "Geography"
+msgstr "Geografio"
 
-#~ msgid "Word count"
-#~ msgstr "Sumo da vortoj"
+msgid "Math"
+msgstr "Matematiko"
 
-#~ msgid "Continue"
-#~ msgstr "Daŭrigu"
+msgid "Science"
+msgstr "Scienco"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Vi kompletigis la krucvorton!"
+msgid "Computer Science"
+msgstr "Komputiko"
diff --git a/crossword_puzzle/locales/es/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/es/LC_MESSAGES/messages.mo
index 49747b926..9fea5bc24 100644
Binary files a/crossword_puzzle/locales/es/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/es/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/es/LC_MESSAGES/messages.po b/crossword_puzzle/locales/es/LC_MESSAGES/messages.po
index 6745e862c..687dd3108 100644
--- a/crossword_puzzle/locales/es/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: es <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crucigrama"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Ver crucigramas"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Sal de la aplicación"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Ajustes globales"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Idiomas"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Tamaño"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "luz"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "oscuro"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "horrible"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pobre"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "promedio"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "excelente"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfecto"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Calidad de crucigrama"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Navegador de crucigramas"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Regresa"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Cargar crucigrama"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Abrir aplicación web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Terminar la aplicación web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferencias de recuento de palabras"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Seleccionar recuento de palabras"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Máximo"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Costumbre"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Para realizar esta operación, primero debe seleccionar una celda."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Vista"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Cerca"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "dificultad"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "palabras totales"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dificultad"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Seleccionar"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Reanudar"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "¿Estás seguro de que quieres reiniciar la aplicación?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Salida"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "¿Estás seguro de que quieres salir de la aplicación? Si la aplicación web se"
 " está ejecutando, se finalizará."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "De vuelta a casa"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "¿Estás seguro de que quieres volver a la pantalla de inicio? La aplicación "
 "web se cerrará."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Error"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Este idioma ya está seleccionado."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Este tamaño ya está seleccionado."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Esta apariencia ya está seleccionada."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Esta calidad ya está seleccionada."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Información"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "Monitor de actividad en MacOS o simplemente reinicie su computadora para "
 "finalizarlos."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "cwords. NOTA: Solo se accede a los datos básicos del crucigrama cuando su "
 "versión traducida no está presente en el directorio local."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "Se produjo un error en la generación de crucigramas. Consulte más "
 "información en la consola."
 
-msgid "Easy"
-msgstr "Fácil"
-
-msgid "Medium"
-msgstr "Medio"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crucigrama - Juego"
 
-msgid "Hard"
-msgstr "Duro"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Al otro lado"
 
-msgid "Extreme"
-msgstr "Extremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Abajo"
 
-msgid "Geography"
-msgstr "Geografía"
-
-msgid "Math"
-msgstr "Matemáticas"
-
-msgid "Science"
-msgstr "Ciencia"
-
-msgid "Computer Science"
-msgstr "Ciencias de la Computación"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Revelar"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Celda"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitales"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Palabra"
 
-#~ msgid "Countries"
-#~ msgstr "Países"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Cuadrícula"
 
-#~ msgid "Easy"
-#~ msgstr "Fácil"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Comprobar"
 
-#~ msgid "Medium"
-#~ msgstr "Medio"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "claro"
 
-#~ msgid "Hard"
-#~ msgstr "Duro"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Salto inteligente"
 
-#~ msgid "Extreme"
-#~ msgstr "Extremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Haga clic para ampliar"
 
-#~ msgid "Geography"
-#~ msgstr "Geografía"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Estás viendo"
 
-#~ msgid "Science"
-#~ msgstr "Tamaño"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "de"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Para verificar o revelar una celda/palabra, primero debe seleccionar una "
-#~ "celda"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "No se pudieron insertar palabra(s), lo siento."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crucigrama - Juego"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "recuento de palabras (ajustado)"
 
-#~ msgid "Across"
-#~ msgstr "Al otro lado de"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "recuento de palabras"
 
-#~ msgid "Down"
-#~ msgstr "Abajo"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continuar"
 
-#~ msgid "Reveal"
-#~ msgstr "Revelar"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "¡Has completado el crucigrama!"
 
-#~ msgid "Cell"
-#~ msgstr "Celúla"
-
-#~ msgid "Word"
-#~ msgstr "Palabra"
-
-#~ msgid "Grid"
-#~ msgstr "Red"
-
-#~ msgid "Check"
-#~ msgstr "Controlar"
-
-#~ msgid "Clear"
-#~ msgstr "Claro"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Skip inteligente"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Haga clic en Zoom"
+msgid "Easy"
+msgstr "Fácil"
 
-#~ msgid "You are viewing"
-#~ msgstr "Estas viendo"
+msgid "Medium"
+msgstr "Medio"
 
-#~ msgid "from"
-#~ msgstr "de"
+msgid "Hard"
+msgstr "Duro"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "No se pudieron insertar palabras, lo siento."
+msgid "Extreme"
+msgstr "Extremo"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Recuento de palabras (ajustado)"
+msgid "Geography"
+msgstr "Geografía"
 
-#~ msgid "Word count"
-#~ msgstr "El recuento de palabras"
+msgid "Math"
+msgstr "Matemáticas"
 
-#~ msgid "Continue"
-#~ msgstr "Continuar"
+msgid "Science"
+msgstr "Ciencia"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "¡Has completado el crucigrama!"
+msgid "Computer Science"
+msgstr "Ciencias de la Computación"
diff --git a/crossword_puzzle/locales/et/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/et/LC_MESSAGES/messages.mo
index a6ae2aef4..e3373fa98 100644
Binary files a/crossword_puzzle/locales/et/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/et/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/et/LC_MESSAGES/messages.po b/crossword_puzzle/locales/et/LC_MESSAGES/messages.po
index 7b7a39ab1..e51d674df 100644
--- a/crossword_puzzle/locales/et/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/et/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: et <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Ristsõna"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Vaadake ristsõnu"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Välju rakendusest"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globaalsed seaded"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Keeled"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Suurus"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "valgus"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tume"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "süsteem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Välimus"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "kohutav"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "vaene"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "keskmine"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "suur"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "täiuslik"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ristsõnade kvaliteet"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Ristsõna brauser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Mine tagasi"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Laadige ristsõna"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Avage veebirakendus"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Lõpetage veebirakendus"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Sõnade arvu eelistused"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Valige sõnade arv"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimaalne"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Kohandatud"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Selle toimingu tegemiseks peate kõigepealt valima lahtri."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Vaade"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Sulge"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "raskus"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Sõnu kokku"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Raskus"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Valige"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Taaskäivita"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Kas olete kindel, et soovite rakenduse taaskäivitada?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Välju"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Kas olete kindel, et soovite rakendusest väljuda? Kui veebirakendus töötab, "
 "siis see lõpetatakse."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Tagasi koju"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Kas olete kindel, et soovite naasta avakuvale? Veebirakendus lõpetatakse."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Viga"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "See keel on juba valitud."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "See suurus on juba valitud."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "See välimus on juba valitud."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "See kvaliteet on juba valitud."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "MacOS-i Activity Monitori kaudu või nende lõpetamiseks lihtsalt "
 "taaskäivitage arvuti."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,123 +229,110 @@ msgstr ""
 "Ristsõna põhiandmetele pääseb juurde ainult siis, kui nende tõlgitud "
 "versiooni lokaadikataloogis pole."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "Ristsõna loomisel ilmnes viga. Vaadake lisateavet konsoolist"
 
-msgid "Easy"
-msgstr "Lihtne"
-
-msgid "Medium"
-msgstr "Keskmine"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Ristsõna - mäng"
 
-msgid "Hard"
-msgstr "Raske"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Üle"
 
-msgid "Extreme"
-msgstr "Ekstreemne"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Alla"
 
-msgid "Geography"
-msgstr "Geograafia"
-
-msgid "Math"
-msgstr "matemaatika"
-
-msgid "Science"
-msgstr "Teadus"
-
-msgid "Computer Science"
-msgstr "Arvutiteadus"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Paljastama"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Kamber"
 
-#~ msgid "Capitals"
-#~ msgstr "Pealinnad"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Sõna"
 
-#~ msgid "Countries"
-#~ msgstr "Riigid"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Ruudustik"
 
-#~ msgid "Easy"
-#~ msgstr "Lihtne"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrollima"
 
-#~ msgid "Medium"
-#~ msgstr "Keskmine"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Selge"
 
-#~ msgid "Hard"
-#~ msgstr "Raske"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Nutikas vahelejätmine"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstreemne"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klõpsake suumimiseks"
 
-#~ msgid "Geography"
-#~ msgstr "Geograafia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Sa vaatad"
 
-#~ msgid "Science"
-#~ msgstr "Suurus"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "-lt"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Lahtri/sõna kontrollimiseks või kuvamiseks peate esmalt valima lahtri"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Sõna (d) ei saanud sisestada, vabandust."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Ristsõna - mäng"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Sõnade arv (kohandatud)"
 
-#~ msgid "Across"
-#~ msgstr "Üle"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Sõnade arv"
 
-#~ msgid "Down"
-#~ msgstr "Alla"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Jätkuma"
 
-#~ msgid "Reveal"
-#~ msgstr "Paljasta"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Lõpetasite ristsõna!"
 
-#~ msgid "Cell"
-#~ msgstr "Kamber"
-
-#~ msgid "Word"
-#~ msgstr "Sõna"
-
-#~ msgid "Grid"
-#~ msgstr "Võre"
-
-#~ msgid "Check"
-#~ msgstr "Kontrollima"
-
-#~ msgid "Clear"
-#~ msgstr "Selge"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Nutikas vahelejätmine"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klõpsake suumimiseks"
+msgid "Easy"
+msgstr "Lihtne"
 
-#~ msgid "You are viewing"
-#~ msgstr "Sa vaatad"
+msgid "Medium"
+msgstr "Keskmine"
 
-#~ msgid "from"
-#~ msgstr "alates"
+msgid "Hard"
+msgstr "Raske"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "sõna(sid) ei saanud sisestada, vabandust."
+msgid "Extreme"
+msgstr "Ekstreemne"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Sõnade arv (kohandatud)"
+msgid "Geography"
+msgstr "Geograafia"
 
-#~ msgid "Word count"
-#~ msgstr "Sõnade arv"
+msgid "Math"
+msgstr "matemaatika"
 
-#~ msgid "Continue"
-#~ msgstr "Jätka"
+msgid "Science"
+msgstr "Teadus"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Sa täitsid ristsõna!"
+msgid "Computer Science"
+msgstr "Arvutiteadus"
diff --git a/crossword_puzzle/locales/eu/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/eu/LC_MESSAGES/messages.mo
index 61dc19d8e..6e2806ebc 100644
Binary files a/crossword_puzzle/locales/eu/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/eu/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/eu/LC_MESSAGES/messages.po b/crossword_puzzle/locales/eu/LC_MESSAGES/messages.po
index 0773d0cc8..69b870340 100644
--- a/crossword_puzzle/locales/eu/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/eu/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: eu <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Gurutzegrama"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Ikusi gurutzegramak"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Irten aplikaziotik"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Ezarpen orokorrak"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Hizkuntzak"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Tamaina"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "argia"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "iluna"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Itxura"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "anker"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "txiro"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "batezbesteko"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "handi"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ezin hobe"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Gurutzegramaren kalitatea"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Gurutzegrama arakatzailea"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Atzera egin"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Kargatu gurutzegrama"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Ireki web aplikazioa"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Amaitu web-aplikazioa"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Hitz kopuruaren hobespenak"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Hautatu hitz kopurua"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Gehienez"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Eragiketa hau burutzeko, gelaxka bat aukeratu behar duzu lehenengo."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Ikusi"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Itxi"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "zailtasuna"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Hitzak guztira"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Zailtasuna"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Hautatu"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Berriro hasi"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ziur aplikazioa berrabiarazi nahi duzula?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Irten"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ziur aplikaziotik irten nahi duzula? Web aplikazioa martxan badago, amaitu "
 "egingo da."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Itzuli etxera"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ziur hasierako pantailara itzuli nahi duzula? Web aplikazioa amaitu egingo "
 "da."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Errorea"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Hizkuntza hau dagoeneko hautatuta dago."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Tamaina hau dagoeneko hautatuta dago."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Itxura hau dagoeneko hautatuta dago."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kalitate hori dagoeneko hautatuta dago."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "aplikazio-prozesu guztiak MacOS-en Activity Monitor-en bidez amaitu daitezke"
 " edo, besterik gabe, berrabiarazi ordenagailua horiek amaitzeko."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "OHARRA: Oinarrizko gurutzegrama-datuetara itzulitako bertsioa lokalen "
 "direktorioan ez dagoenean bakarrik sartzen da."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Errore bat gertatu da hitz gurutzatuak sortzean. Mesedez, ikusi informazio "
 "gehiago kontsolan"
 
-msgid "Easy"
-msgstr "Erraza"
-
-msgid "Medium"
-msgstr "Ertaina"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Gurutzegramaren puzzlea - jokoa"
 
-msgid "Hard"
-msgstr "Gogorra"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "-Tik zehar"
 
-msgid "Extreme"
-msgstr "Muturrekoa"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Beherantz"
 
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Zientzia"
-
-msgid "Computer Science"
-msgstr "Informatika"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Azaldu"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Gela"
 
-#~ msgid "Capitals"
-#~ msgstr "Hiriburuak"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Hitz"
 
-#~ msgid "Countries"
-#~ msgstr "Herrialdeak"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Harbera"
 
-#~ msgid "Easy"
-#~ msgstr "Erraza"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Egiaztatu"
 
-#~ msgid "Medium"
-#~ msgstr "Ertaina"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Hustu"
 
-#~ msgid "Hard"
-#~ msgstr "Gogorra"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Muturrekoa"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Egin klik Zoom egiteko"
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Ikusten ari zara"
 
-#~ msgid "Science"
-#~ msgstr "Tamaina"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "-tik"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Gelaxka/hitz bat egiaztatzeko edo erakusteko, lehenik gelaxka bat hautatu "
-#~ "behar duzu"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ezin da hitza sartu, barkatu."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Gurutzegrama - Jokoa"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Hitz kopurua (egokitua)"
 
-#~ msgid "Across"
-#~ msgstr "Zeharka"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Hitz kopurua"
 
-#~ msgid "Down"
-#~ msgstr "Behera"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Jarraitu"
 
-#~ msgid "Reveal"
-#~ msgstr "Agerrarazi"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Gurutzegrama osatu duzu!"
 
-#~ msgid "Cell"
-#~ msgstr "Zelula"
-
-#~ msgid "Word"
-#~ msgstr "Hitza"
-
-#~ msgid "Grid"
-#~ msgstr "Sarea"
-
-#~ msgid "Check"
-#~ msgstr "Egiaztatu"
-
-#~ msgid "Clear"
-#~ msgstr "Garbi"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Egin klik Zoom egiteko"
+msgid "Easy"
+msgstr "Erraza"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ikusten ari zara"
+msgid "Medium"
+msgstr "Ertaina"
 
-#~ msgid "from"
-#~ msgstr "tik"
+msgid "Hard"
+msgstr "Gogorra"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Ezin izan dira txertatu hitzak, barkatu."
+msgid "Extreme"
+msgstr "Muturrekoa"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Hitz kopurua (doitu)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Hitz kopurua"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Jarraitu"
+msgid "Science"
+msgstr "Zientzia"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Gurutzegrama osatu duzu!"
+msgid "Computer Science"
+msgstr "Informatika"
diff --git a/crossword_puzzle/locales/fi/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/fi/LC_MESSAGES/messages.mo
index 7acf5c3fb..455f79e1c 100644
Binary files a/crossword_puzzle/locales/fi/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/fi/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/fi/LC_MESSAGES/messages.po b/crossword_puzzle/locales/fi/LC_MESSAGES/messages.po
index 1b17672dd..3551923d0 100644
--- a/crossword_puzzle/locales/fi/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/fi/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fi <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Ristisanatehtävä"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Näytä ristisanatehtävät"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Poistu sovelluksesta"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Yleiset asetukset"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Kieli (kielet"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Koko"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "valoa"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tumma"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "järjestelmä"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ulkomuoto"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "kauhea"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "huono"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "keskiverto"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "loistava"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "täydellinen"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ristisanan laatu"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Ristisanatehtävä selain"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Mene takaisin"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Lataa ristisanatehtävä"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Avaa verkkosovellus"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Lopeta verkkosovellus"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Sanamääräasetukset"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Valitse sanamäärä"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Enimmäismäärä"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Tämän toiminnan suorittamiseksi sinun on ensin valittava solu."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Näytä"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "kiinni"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "vaikeus"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Sanoja yhteensä"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Vaikeus"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Valitse"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Uudelleenkäynnistää"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Haluatko varmasti käynnistää sovelluksen uudelleen?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Poistu"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,42 +158,43 @@ msgstr ""
 "Haluatko varmasti poistua sovelluksesta? Jos verkkosovellus on käynnissä, se"
 " lopetetaan."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Takaisin kotiin"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "Haluatko varmasti palata aloitusnäyttöön? Verkkosovellus lopetetaan."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Virhe"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Tämä kieli on jo valittu."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Tämä koko on jo valittu."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Tämä ulkoasu on jo valittu."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Tämä laatu on jo valittu."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Tiedot"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -224,7 +216,7 @@ msgstr ""
 "voidaan lopettaa MacOS:n Activity Monitorin kautta tai lopettaa ne "
 "yksinkertaisesti käynnistämällä tietokoneesi uudelleen."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -236,125 +228,110 @@ msgstr ""
 "HUOMAUTUS: Perusristisanatietoa käytetään vain, kun sen käännetty versio ei "
 "ole kielihakemistossa."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "Ristisanan luomisessa tapahtui virhe. Katso lisätietoja konsolista"
 
-msgid "Easy"
-msgstr "Helppo"
-
-msgid "Medium"
-msgstr "Keskikokoinen"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Ristisanatehtävä - peli"
 
-msgid "Hard"
-msgstr "Kovaa"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Poikki"
 
-msgid "Extreme"
-msgstr "Äärimmäistä"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Alas"
 
-msgid "Geography"
-msgstr "Maantiede"
-
-msgid "Math"
-msgstr "Matematiikka"
-
-msgid "Science"
-msgstr "Tiede"
-
-msgid "Computer Science"
-msgstr "Tietokone Tiede"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Paljastaa"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Solu"
 
-#~ msgid "Capitals"
-#~ msgstr "Pääkaupungit"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Sana"
 
-#~ msgid "Countries"
-#~ msgstr "Maat"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Ruudukko"
 
-#~ msgid "Easy"
-#~ msgstr "Helppo"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Tarkistaa"
 
-#~ msgid "Medium"
-#~ msgstr "Keskikokoinen"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Asia selvä"
 
-#~ msgid "Hard"
-#~ msgstr "Kovaa"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Älykäs"
 
-#~ msgid "Extreme"
-#~ msgstr "Äärimmäistä"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Napsauta Zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Maantiede"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Katsot"
 
-#~ msgid "Science"
-#~ msgstr "Koko"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "-sta"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Jos haluat tarkistaa tai paljastaa solun/sanan, sinun on ensin valittava "
-#~ "solu"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Sanaa (t) ei voitu työntää, anteeksi."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Ristisanatehtävä - Peli"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Sanamäärä (mukautettu)"
 
-#~ msgid "Across"
-#~ msgstr "Poikki"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Sanamäärä"
 
-#~ msgid "Down"
-#~ msgstr "Alas"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Jatkaa"
 
-#~ msgid "Reveal"
-#~ msgstr "Paljastaa"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Suoritin ristisanan!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Sana"
-
-#~ msgid "Grid"
-#~ msgstr "Ruudukko"
-
-#~ msgid "Check"
-#~ msgstr "Tarkistaa"
-
-#~ msgid "Clear"
-#~ msgstr "Asia selvä"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Älykäs"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Napsauta Zoom"
+msgid "Easy"
+msgstr "Helppo"
 
-#~ msgid "You are viewing"
-#~ msgstr "Olet katsomassa"
+msgid "Medium"
+msgstr "Keskikokoinen"
 
-#~ msgid "from"
-#~ msgstr "alkaen"
+msgid "Hard"
+msgstr "Kovaa"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "sanoja ei voitu lisätä, anteeksi."
+msgid "Extreme"
+msgstr "Äärimmäistä"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Sanamäärä (mukautettu)"
+msgid "Geography"
+msgstr "Maantiede"
 
-#~ msgid "Word count"
-#~ msgstr "Sanamäärä"
+msgid "Math"
+msgstr "Matematiikka"
 
-#~ msgid "Continue"
-#~ msgstr "Jatkaa"
+msgid "Science"
+msgstr "Tiede"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Täytit ristisanatehtävän!"
+msgid "Computer Science"
+msgstr "Tietokone Tiede"
diff --git a/crossword_puzzle/locales/fr/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/fr/LC_MESSAGES/messages.mo
index ff8205e2a..380c54a08 100644
Binary files a/crossword_puzzle/locales/fr/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/fr/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/fr/LC_MESSAGES/messages.po b/crossword_puzzle/locales/fr/LC_MESSAGES/messages.po
index dc2a3df92..59e96de7c 100644
--- a/crossword_puzzle/locales/fr/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/fr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Mots croisés"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Afficher les mots croisés"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Quittez l'application"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Paramètres globaux"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Langues"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Taille"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lumière"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "sombre"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "système"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Apparence"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "horrible"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "médiocre"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "moyenne"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "super"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "parfait"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Qualité des mots croisés"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Navigateur de mots croisés"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Retourner"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Charger les mots croisés"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Ouvrir l'application Web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Terminer l'application Web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Préférences de nombre de mots"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Sélectionnez le nombre de mots"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Coutume"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Pour effectuer cette opération, vous devez d'abord sélectionner une cellule."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Voir"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Fermer"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "difficulté"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Nombre total de mots"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Difficulté"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Sélectionner"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Redémarrage"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Êtes-vous sûr de vouloir redémarrer l'application ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Sortie"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,11 +159,11 @@ msgstr ""
 "Êtes-vous sûr de vouloir quitter l'application ? Si l'application Web est en"
 " cours d'exécution, elle sera terminée."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "De retour à la maison"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -180,32 +171,33 @@ msgstr ""
 "Êtes-vous sûr de vouloir revenir à l'écran d'accueil ? L'application Web "
 "sera fermée."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Erreur"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Cette langue est déjà sélectionnée."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Cette taille est déjà sélectionnée."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Cette apparence est déjà sélectionnée."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Cette qualité est déjà sélectionnée."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -229,7 +221,7 @@ msgstr ""
 "interrompus via Activity Monitor sur MacOS ou redémarrez simplement votre "
 "ordinateur pour y mettre fin."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -242,7 +234,7 @@ msgstr ""
 " sont accessibles que lorsque leur version traduite n'est pas présente dans "
 "le répertoire locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -250,119 +242,104 @@ msgstr ""
 "Une erreur s'est produite lors de la génération des mots croisés. Veuillez "
 "consulter plus d'informations dans la console"
 
-msgid "Easy"
-msgstr "Facile"
-
-msgid "Medium"
-msgstr "Moyen"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Mots croisés - Jeu"
 
-msgid "Hard"
-msgstr "Dur"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "À travers"
 
-msgid "Extreme"
-msgstr "Extrême"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "vers le bas"
 
-msgid "Geography"
-msgstr "Géographie"
-
-msgid "Math"
-msgstr "Mathématiques"
-
-msgid "Science"
-msgstr "Science"
-
-msgid "Computer Science"
-msgstr "L'informatique"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Révéler"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cellule"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitales"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Mot"
 
-#~ msgid "Countries"
-#~ msgstr "Des pays"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grille"
 
-#~ msgid "Easy"
-#~ msgstr "Facile"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Vérifier"
 
-#~ msgid "Medium"
-#~ msgstr "Moyen"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Effacer"
 
-#~ msgid "Hard"
-#~ msgstr "Dur"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Saut intelligent"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrême"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Cliquez pour zoomer"
 
-#~ msgid "Geography"
-#~ msgstr "Géographie"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Vous regardez"
 
-#~ msgid "Science"
-#~ msgstr "Taille"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "de"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Pour vérifier ou révéler une cellule/un mot, vous devez d'abord sélectionner"
-#~ " une cellule"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "le(s) mot(s) n'ont pas pu être insérés, désolé."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Mots croisés - Jeu"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "nombre de mots (ajusté)"
 
-#~ msgid "Across"
-#~ msgstr "À travers"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "nombre de mots"
 
-#~ msgid "Down"
-#~ msgstr "Vers le bas"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continuer"
 
-#~ msgid "Reveal"
-#~ msgstr "Révéler"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Vous avez terminé les mots croisés !"
 
-#~ msgid "Cell"
-#~ msgstr "Cellule"
-
-#~ msgid "Word"
-#~ msgstr "Mot"
-
-#~ msgid "Grid"
-#~ msgstr "Grille"
-
-#~ msgid "Check"
-#~ msgstr "Vérifier"
-
-#~ msgid "Clear"
-#~ msgstr "Clair"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Saut intelligent"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Cliquez pour zoom"
+msgid "Easy"
+msgstr "Facile"
 
-#~ msgid "You are viewing"
-#~ msgstr "Vous regardez"
+msgid "Medium"
+msgstr "Moyen"
 
-#~ msgid "from"
-#~ msgstr "depuis"
+msgid "Hard"
+msgstr "Dur"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Le(s) mot(s) n'ont pas pu être insérés, désolé."
+msgid "Extreme"
+msgstr "Extrême"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Nombre de mots (ajusté)"
+msgid "Geography"
+msgstr "Géographie"
 
-#~ msgid "Word count"
-#~ msgstr "Nombre de mots"
+msgid "Math"
+msgstr "Mathématiques"
 
-#~ msgid "Continue"
-#~ msgstr "Continuer"
+msgid "Science"
+msgstr "Science"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Vous avez terminé les mots croisés !"
+msgid "Computer Science"
+msgstr "L'informatique"
diff --git a/crossword_puzzle/locales/fy/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/fy/LC_MESSAGES/messages.mo
index 5988649d4..94d25474d 100644
Binary files a/crossword_puzzle/locales/fy/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/fy/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/fy/LC_MESSAGES/messages.po b/crossword_puzzle/locales/fy/LC_MESSAGES/messages.po
index d712d62a8..254858ce5 100644
--- a/crossword_puzzle/locales/fy/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/fy/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fy <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krúswurdpuzel"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Besjoch krúswurdwurden"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ferlitte de app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globale ynstellings"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Talen"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Grutte"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ljocht"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tsjuster"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "systeem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ferskining"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "freeslik"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "earm"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "trochsneed"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "grut"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfekt"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krúswurdkwaliteit"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Gean werom"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Laden krúswurd"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Iepenje webapp"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Beëinigje webapp"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Wurd count foarkar"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Selektearje wurd count"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Oanpast"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Dizze hanneling útfiere, moatte jo earst in sel selektearje."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Fisy"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Slute"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "swierrichheid"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Totaal wurden"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Swierrichheid"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Útkieze"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Op 'e nij begjinne"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Binne jo wis dat jo de app opnij starte wolle?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Útgong"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Binne jo wis dat jo de app ôfslute wolle? As de webapp rint, sil dizze wurde"
 " beëinige."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Wêrom nei hûs"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Binne jo wis dat jo werom wolle nei it thússkerm? De webapp sil wurde "
 "beëinige."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Fersin"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Dizze taal is al selektearre."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Dizze grutte is al selektearre."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Dit uterlik is al selektearre."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Dizze kwaliteit is al selekteare."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "beëinige fia Activity Monitor op MacOS, of gewoan jo kompjûter opnij starte "
 "om se te beëinigjen."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "OPMERKING: Basis krúswurdgegevens binne allinich tagonklik as de oersette "
 "ferzje net oanwêzich is yn 'e lokaasjemap."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Der barde in flater yn it generearjen fan krúswurdwurden. Sjoch asjebleaft "
 "mear ynformaasje yn 'e konsole"
 
-msgid "Easy"
-msgstr "Maklik"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - Game"
 
-msgid "Hard"
-msgstr "Hurd"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Oer"
 
-msgid "Extreme"
-msgstr "Ekstreem"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Omleech"
 
-msgid "Geography"
-msgstr "Geografy"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Wittenskip"
-
-msgid "Computer Science"
-msgstr "Komputer wittenskip"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Iepenbierje"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sel"
 
-#~ msgid "Capitals"
-#~ msgstr "Haadstêden"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Wurd"
 
-#~ msgid "Countries"
-#~ msgstr "Lannen"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Baster"
 
-#~ msgid "Easy"
-#~ msgstr "Maklik"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrôle"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Opklearje"
 
-#~ msgid "Hard"
-#~ msgstr "Hurd"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstreem"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klikje om te zoomjen"
 
-#~ msgid "Geography"
-#~ msgstr "Geografy"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Do besjochtst"
 
-#~ msgid "Science"
-#~ msgstr "Grutte"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "fan"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Om in sel/wurd te kontrolearjen of iepenbierjen, moatte jo earst in sel "
-#~ "selektearje"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "wurd (s) koe net wurde ynfoege, sorry."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Game"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Wurdtelling (oanpast)"
 
-#~ msgid "Across"
-#~ msgstr "Oer"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Wurd telle"
 
-#~ msgid "Down"
-#~ msgstr "Omleech"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Trochgean"
 
-#~ msgid "Reveal"
-#~ msgstr "Iepenbierje"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Jo hawwe it krúswurd foltôge!"
 
-#~ msgid "Cell"
-#~ msgstr "Sel"
-
-#~ msgid "Word"
-#~ msgstr "Wurd"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Kontrôle"
-
-#~ msgid "Clear"
-#~ msgstr "Opklearje"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klikje om te zoomjen"
+msgid "Easy"
+msgstr "Maklik"
 
-#~ msgid "You are viewing"
-#~ msgstr "Jo besjogge"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "fan"
+msgid "Hard"
+msgstr "Hurd"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Wurd(en) koene net ynfoege wurde, sorry."
+msgid "Extreme"
+msgstr "Ekstreem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Wurdtelling (oanpast)"
+msgid "Geography"
+msgstr "Geografy"
 
-#~ msgid "Word count"
-#~ msgstr "Wurdteller"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Trochgean"
+msgid "Science"
+msgstr "Wittenskip"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Jo foltôge it krúswurd!"
+msgid "Computer Science"
+msgstr "Komputer wittenskip"
diff --git a/crossword_puzzle/locales/ga/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ga/LC_MESSAGES/messages.mo
index 07ff0c05b..ca358c5ae 100644
Binary files a/crossword_puzzle/locales/ga/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ga/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ga/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ga/LC_MESSAGES/messages.po
index fb0d57640..1bf3773c2 100644
--- a/crossword_puzzle/locales/ga/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ga/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Bhfreagra crossword"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Féach ar chrosfhocail"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Scoir an app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Socruithe Domhanda"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Teangacha"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Méid"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "éadrom"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "dorcha"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "córas"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Dealramh"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "uafásach"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "droch-"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ar an meán"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "mór-"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "cuir isteach ar"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Caighdeán crosfhocal"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Brabhsálaí Crosfhocal"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Dul ar ais"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Íoslódáil crosfhocal"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Oscail app gréasáin"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Deireadh a chur le app gréasáin"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Roghanna comhaireamh focal"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Roghnaigh líon na bhfocal"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Uasmhéid"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Saincheaptha"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Chun an oibríocht seo a dhéanamh, ní mór duit cill a roghnú ar dtús."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Amharc"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Dún"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "deacracht"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Focail iomlána"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Deacracht"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Roghnaigh"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Tosaigh arís"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "An bhfuil tú cinnte gur mhaith leat an aip a atosú?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "An slí amach"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "An bhfuil tú cinnte gur mhaith leat éirí as an aip? Má tá an app gréasáin ag"
 " rith, cuirfear deireadh leis."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Ar ais go dtí Baile"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "An bhfuil tú cinnte gur mhaith leat dul ar ais go dtí an scáileán baile? "
 "Cuirfear deireadh leis an app gréasáin."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Earráid"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Tá an teanga seo roghnaithe cheana féin."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Tá an méid seo roghnaithe cheana féin."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Tá an chuma seo roghnaithe cheana féin."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Roghnaítear an caighdeán seo cheana féin."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Eolas"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "curtha i gceart a fhoirceannadh trí Gníomhaíocht Monatóireacht a dhéanamh ar"
 " MacOS, nó, go simplí atosú do ríomhaire chun deireadh a chur leo."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,125 +231,111 @@ msgstr ""
 "DEARA: Ní fhaightear rochtain ar bhunshonraí crosfhocail ach amháin nuair "
 "nach bhfuil a leagan aistrithe i láthair san eolaire locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "Tharla earráid i nginiúint crosfhocail. Féach tuilleadh eolais sa chonsól"
 
-msgid "Easy"
-msgstr "Éasca"
-
-msgid "Medium"
-msgstr "Mheán"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crosfhocal Puzal - Cluiche"
 
-msgid "Hard"
-msgstr "Deacair"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Ar fud"
 
-msgid "Extreme"
-msgstr "mhór"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "In íochtar"
 
-msgid "Geography"
-msgstr "Tíreolaíocht"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Eolaíocht"
-
-msgid "Computer Science"
-msgstr "Eolaíocht Ríomhaireachta"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Nocht"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Guthán póca"
 
-#~ msgid "Capitals"
-#~ msgstr "Príomhchathracha"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Scéal"
 
-#~ msgid "Countries"
-#~ msgstr "Tíortha"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Eangach"
 
-#~ msgid "Easy"
-#~ msgstr "Éasca"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Seic"
 
-#~ msgid "Medium"
-#~ msgstr "Mheán"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Glan amach"
 
-#~ msgid "Hard"
-#~ msgstr "Deacair"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Scip cliste"
 
-#~ msgid "Extreme"
-#~ msgstr "mhór"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Cliceáil chun súmáil isteach"
 
-#~ msgid "Geography"
-#~ msgstr "Tíreolaíocht"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Tá tú ag breathnú"
 
-#~ msgid "Science"
-#~ msgstr "Méid"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ó"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Chun cill/focal a sheiceáil nó a nochtadh, ní mór duit cill a roghnú ar dtús"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Níorbh fhéidir focal (í) a chur isteach, tá brón orm."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Puzal Crosfhocal - Cluiche"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Comhaireamh focal (coigeartaithe)"
 
-#~ msgid "Across"
-#~ msgstr "trasna"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Comhaireamh focal"
 
-#~ msgid "Down"
-#~ msgstr "an Dúin"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Leanúint ar aghaidh"
 
-#~ msgid "Reveal"
-#~ msgstr "Nocht"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Chríochnaigh tú an crosfhocal!"
 
-#~ msgid "Cell"
-#~ msgstr "cill"
-
-#~ msgid "Word"
-#~ msgstr "Focal"
-
-#~ msgid "Grid"
-#~ msgstr "Greille"
-
-#~ msgid "Check"
-#~ msgstr "Seiceáil"
-
-#~ msgid "Clear"
-#~ msgstr "Glan"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Scip cliste"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Cliceáil chun súmáil isteach"
+msgid "Easy"
+msgstr "Éasca"
 
-#~ msgid "You are viewing"
-#~ msgstr "Tá tú ag breathnú"
+msgid "Medium"
+msgstr "Mheán"
 
-#~ msgid "from"
-#~ msgstr "ó"
+msgid "Hard"
+msgstr "Deacair"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "níorbh fhéidir focal (focail) a chur isteach, faraor."
+msgid "Extreme"
+msgstr "mhór"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Líon na bhfocal (coigeartaithe)"
+msgid "Geography"
+msgstr "Tíreolaíocht"
 
-#~ msgid "Word count"
-#~ msgstr "Comhaireamh focal"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Leanúint ar aghaidh"
+msgid "Science"
+msgstr "Eolaíocht"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Chríochnaigh tú an crosfhocal!"
+msgid "Computer Science"
+msgstr "Eolaíocht Ríomhaireachta"
diff --git a/crossword_puzzle/locales/gd/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/gd/LC_MESSAGES/messages.mo
index 38529a259..15787f5b1 100644
Binary files a/crossword_puzzle/locales/gd/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/gd/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/gd/LC_MESSAGES/messages.po b/crossword_puzzle/locales/gd/LC_MESSAGES/messages.po
index ae24a475c..4e84d7f99 100644
--- a/crossword_puzzle/locales/gd/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/gd/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: gd <LL@li.org>\n"
@@ -19,149 +19,140 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Tòimhseachan Crois-fhacal"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Seall crois-fhacal"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Cuir a-mach an aplacaid"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Roghainnean cruinne"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Cànanan"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Meud"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "aotrom"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "dorcha"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "siostam"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Coltas"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "uamhasach"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "bochd"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "cuibheasach"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "sgoinneil"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "foirfe"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Càileachd Crossford"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Brabhsair crois-fhacal"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Theirig air ais"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Luchdaich a-nuas crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Fosgail app lìn"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Cuir crìoch air an aplacaid lìn"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Roghainnean àireamh fhaclan"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Tagh àireamh facal"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "As àirde"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Gnàthach"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Gus an obair seo a choileanadh, feumaidh tu cealla a thaghadh an toiseach."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Sealladh"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Dùin"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "duilgheadas"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Faclan iomlan"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Duilgheadas"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Tagh"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Ath-thòisich"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr ""
 "A bheil thu cinnteach gu bheil thu airson an aplacaid ath-thòiseachadh?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ar-a-mach"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -169,11 +160,11 @@ msgstr ""
 "A bheil thu cinnteach gu bheil thu airson an aplacaid fhàgail? Ma tha an "
 "aplacaid lìn a 'ruith, thèid a thoirt gu crìch."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Air ais dhan dachaigh"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -181,32 +172,33 @@ msgstr ""
 "A bheil thu cinnteach gu bheil thu airson a dhol air ais chun sgrion "
 "dachaigh? Thèid an app lìn a thoirt gu crìch."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Mearachd"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Tha an cànan seo air a thaghadh mu thràth."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Tha am meud seo air a thaghadh mu thràth."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Tha an coltas seo air a thaghadh mar-thà."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Tha an càileachd seo air a thaghadh mar-thà."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Fiosrachadh"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -230,7 +222,7 @@ msgstr ""
 "Activity Monitor air MacOS, no, dìreach ath-thòisich do choimpiutair gus an "
 "crìochnachadh."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -243,7 +235,7 @@ msgstr ""
 "fhacal bunaiteach ach nuair nach eil an dreach eadar-theangaichte aige an "
 "làthair anns an eòlaire locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -251,119 +243,104 @@ msgstr ""
 "Thachair mearachd ann an gineadh crois-fhacal. Feuch an toir thu sùil air "
 "tuilleadh fiosrachaidh anns a’ chonsail"
 
-msgid "Easy"
-msgstr "Furasta"
-
-msgid "Medium"
-msgstr "Meadhanach"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Tòimhseachan Crossword - Gèam"
 
-msgid "Hard"
-msgstr "Cruaidh"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "A-null"
 
-msgid "Extreme"
-msgstr "anabarrach"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Sìos"
 
-msgid "Geography"
-msgstr "Cruinn-eòlas"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Saidheans"
-
-msgid "Computer Science"
-msgstr "Saidheans Coimpiutaireachd"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Nochdaidh"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cell"
 
-#~ msgid "Capitals"
-#~ msgstr "Prìomh-bhailtean"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Facal"
 
-#~ msgid "Countries"
-#~ msgstr "Dùthchannan"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Furasta"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Thoir sùil"
 
-#~ msgid "Medium"
-#~ msgstr "Meadhanach"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Soilleir"
 
-#~ msgid "Hard"
-#~ msgstr "Cruaidh"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Sgeama Smart"
 
-#~ msgid "Extreme"
-#~ msgstr "anabarrach"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Cliog gus gluasad"
 
-#~ msgid "Geography"
-#~ msgstr "Cruinn-eòlas"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Tha thu a 'coimhead"
 
-#~ msgid "Science"
-#~ msgstr "Meud"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "bho"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Gus cill/facal a sgrùdadh no fhoillseachadh, feumaidh tu cealla a thaghadh "
-#~ "an-toiseach"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Cha b 'urrainnear facal (ean) a chuir a-steach, duilich."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Tòimhseachan Crois-fhacal - Gèam"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Cunntas fhaclan (air atharrachadh)"
 
-#~ msgid "Across"
-#~ msgstr "Tarsainn"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Cunntas fhaclan"
 
-#~ msgid "Down"
-#~ msgstr "Sìos"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Lean air adhart"
 
-#~ msgid "Reveal"
-#~ msgstr "Nochd"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Chuir thu crìoch air a 'chrois-fhacal!"
 
-#~ msgid "Cell"
-#~ msgstr "cill"
-
-#~ msgid "Word"
-#~ msgstr "Facal"
-
-#~ msgid "Grid"
-#~ msgstr "Clèithe"
-
-#~ msgid "Check"
-#~ msgstr "Thoir sùil"
-
-#~ msgid "Clear"
-#~ msgstr "Soilleir"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Sgeama Smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Cliog gus gluasad"
+msgid "Easy"
+msgstr "Furasta"
 
-#~ msgid "You are viewing"
-#~ msgstr "Tha thu a’ coimhead"
+msgid "Medium"
+msgstr "Meadhanach"
 
-#~ msgid "from"
-#~ msgstr "bho"
+msgid "Hard"
+msgstr "Cruaidh"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "cha b’ urrainn dhuinn facal(ean) a chuir a-steach, tha mi duilich."
+msgid "Extreme"
+msgstr "anabarrach"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Cunntas fhaclan (air atharrachadh)"
+msgid "Geography"
+msgstr "Cruinn-eòlas"
 
-#~ msgid "Word count"
-#~ msgstr "Cunntas fhaclan"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Lean air adhart"
+msgid "Science"
+msgstr "Saidheans"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Chrìochnaich thu an crois-fhacal!"
+msgid "Computer Science"
+msgstr "Saidheans Coimpiutaireachd"
diff --git a/crossword_puzzle/locales/gl/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/gl/LC_MESSAGES/messages.mo
index 5be77078d..5aa6d4581 100644
Binary files a/crossword_puzzle/locales/gl/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/gl/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/gl/LC_MESSAGES/messages.po b/crossword_puzzle/locales/gl/LC_MESSAGES/messages.po
index 9b4177c07..6d01afc6d 100644
--- a/crossword_puzzle/locales/gl/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/gl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: gl <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crucigrama"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Ver encrucillados"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Saia da aplicación"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Configuración global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Linguas"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Tamaño"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "luz"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "escuro"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aparición"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "Terrible"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pobre"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "media"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Estupendo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfecto"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Calidade con palabras cruzadas"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Navegador de crucigramas"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Volve atrás"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Cargar crucigramas"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Abre a aplicación web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Finalizar a aplicación web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferencias de conta de palabras"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Seleccione o número de palabras"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Máximo"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Personalizado"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Para realizar esta operación, primeiro debes seleccionar unha cela."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Ver"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Pechar"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "dificultade"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total de palabras"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dificultade"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Seleccione"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Estás seguro de que queres reiniciar a aplicación?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Saír"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Estás seguro de que queres saír da aplicación? Se a aplicación web está en "
 "execución, finalizarase."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "De volta á casa"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Estás seguro de que queres volver á pantalla de inicio? A aplicación web "
 "finalizarase."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Erro"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Este idioma xa está seleccionado."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Este tamaño xa está seleccionado."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Esta aparencia xa está seleccionada."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Esta calidade xa está seleccionada."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Información"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "actividade en MacOS ou, simplemente, reinicia o teu ordenador para "
 "finalizalos."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "NOTA: só se accede aos datos de palabras cruzadas base cando a súa versión "
 "traducida non está presente no directorio local."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "Produciuse un erro na xeración de encrucillados. Consulta máis información "
 "na consola"
 
-msgid "Easy"
-msgstr "Fácil"
-
-msgid "Medium"
-msgstr "Medio"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle cruzado - xogo"
 
-msgid "Hard"
-msgstr "Difícil"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "A través"
 
-msgid "Extreme"
-msgstr "Extremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Abaixo"
 
-msgid "Geography"
-msgstr "Xeografía"
-
-msgid "Math"
-msgstr "Matemáticas"
-
-msgid "Science"
-msgstr "Ciencia"
-
-msgid "Computer Science"
-msgstr "Informática"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Revelar"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cela"
 
-#~ msgid "Capitals"
-#~ msgstr "Maiúsculas"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Palabra"
 
-#~ msgid "Countries"
-#~ msgstr "Países"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rede"
 
-#~ msgid "Easy"
-#~ msgstr "Fácil"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Comprobe"
 
-#~ msgid "Medium"
-#~ msgstr "Medio"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Claro"
 
-#~ msgid "Hard"
-#~ msgstr "Difícil"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Saltar intelixente"
 
-#~ msgid "Extreme"
-#~ msgstr "Extremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Fai clic para ampliar"
 
-#~ msgid "Geography"
-#~ msgstr "Xeografía"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Estás a ver"
 
-#~ msgid "Science"
-#~ msgstr "Tamaño"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "de"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Para comprobar ou revelar unha cela/palabra, primeiro debes seleccionar unha"
-#~ " cela"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Non se puido inserir a palabra (s), perdón."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crucigrama - Xogo"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Conto de palabras (axustado)"
 
-#~ msgid "Across"
-#~ msgstr "A través"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Conta de palabras"
 
-#~ msgid "Down"
-#~ msgstr "Abaixo"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continuar"
 
-#~ msgid "Reveal"
-#~ msgstr "Revelar"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Completaches a palabra cruzada!"
 
-#~ msgid "Cell"
-#~ msgstr "Célula"
-
-#~ msgid "Word"
-#~ msgstr "Palabra"
-
-#~ msgid "Grid"
-#~ msgstr "Reixa"
-
-#~ msgid "Check"
-#~ msgstr "Comproba"
-
-#~ msgid "Clear"
-#~ msgstr "Limpar"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Saltar intelixente"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Fai clic para ampliar"
+msgid "Easy"
+msgstr "Fácil"
 
-#~ msgid "You are viewing"
-#~ msgstr "Estás vendo"
+msgid "Medium"
+msgstr "Medio"
 
-#~ msgid "from"
-#~ msgstr "dende"
+msgid "Hard"
+msgstr "Difícil"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Non se puideron inserir palabras, desculpe."
+msgid "Extreme"
+msgstr "Extremo"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Número de palabras (axustado)"
+msgid "Geography"
+msgstr "Xeografía"
 
-#~ msgid "Word count"
-#~ msgstr "Conta de palabras"
+msgid "Math"
+msgstr "Matemáticas"
 
-#~ msgid "Continue"
-#~ msgstr "Continuar"
+msgid "Science"
+msgstr "Ciencia"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Completaches o encrucillado!"
+msgid "Computer Science"
+msgstr "Informática"
diff --git a/crossword_puzzle/locales/gu/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/gu/LC_MESSAGES/messages.mo
index 5bc302d68..2e9a1b806 100644
Binary files a/crossword_puzzle/locales/gu/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/gu/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/gu/LC_MESSAGES/messages.po b/crossword_puzzle/locales/gu/LC_MESSAGES/messages.po
index 844fb5cfc..8841686c1 100644
--- a/crossword_puzzle/locales/gu/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/gu/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: gu <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ક્રોસવર્ડ પઝલ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ક્રોસવર્ડ્સ જુઓ"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "એપ્લિકેશનમાંથી બહાર નીકળો"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "વૈશ્વિક સેટિંગ્સ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ભાષાઓ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "કદ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "પ્રકાશ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "અંધારું"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "સિસ્ટમ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "દેખાવ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ભયંકર"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ગરીબ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "સરેરાશ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "મહાન"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "સંપૂર્ણ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ક્રોસવર્ડ ગુણવત્તા"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "ક્રોસવર્ડ બ્રાઉઝર"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "પાછા જાવ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ક્રોસવર્ડ લોડ કરો"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "વેબ એપ્લિકેશન ખોલો"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "વેબ એપ્લિકેશન સમાપ્ત કરો"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "શબ્દ ગણતરી પસંદગીઓ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "શબ્દ ગણતરી પસંદ કરો"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "મહત્તમ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "કસ્ટમ"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "આ કામગીરી કરવા માટે, તમારે પહેલા સેલ પસંદ કરવું આવશ્યક છે."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "જુઓ"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "બંધ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "મુશ્કેલી"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "કુલ શબ્દો"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "મુશ્કેલી"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "પસંદ કરો"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "પુનઃપ્રારંભ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "શું તમે ખરેખર એપને પુનઃપ્રારંભ કરવા માંગો છો?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "બહાર નીકળો"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "શું તમે ખરેખર એપ્લિકેશનમાંથી બહાર નીકળવા માંગો છો? જો વેબ એપ્લિકેશન ચાલી રહી"
 " છે, તો તે સમાપ્ત કરવામાં આવશે."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ઘરે પાછા"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "શું તમે ખરેખર હોમ સ્ક્રીન પર પાછા જવા માંગો છો? વેબ એપ્લિકેશન સમાપ્ત કરવામાં"
 " આવશે."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ભૂલ"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "આ ભાષા પહેલેથી જ પસંદ કરેલ છે."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "આ કદ પહેલેથી જ પસંદ કરેલ છે."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "આ દેખાવ પહેલેથી જ પસંદ કરેલ છે."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "આ ગુણવત્તા પહેલાથી જ પસંદ થયેલ છે."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "માહિતી"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "નથી તે MacOS પર પ્રવૃત્તિ મોનિટર દ્વારા સમાપ્ત થઈ શકે છે, અથવા, તેને સમાપ્ત "
 "કરવા માટે ફક્ત તમારા કમ્પ્યુટરને ફરીથી પ્રારંભ કરો."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,124 +230,110 @@ msgstr ""
 "ક્રોસવર્ડ ડેટા ફક્ત ત્યારે જ એક્સેસ થાય છે જ્યારે તેનું ભાષાંતરિત સંસ્કરણ "
 "લોકેલ ડિરેક્ટરીમાં હાજર ન હોય."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "ક્રોસવર્ડ જનરેશનમાં ભૂલ આવી. કૃપા કરીને કન્સોલમાં વધુ માહિતી જુઓ"
 
-msgid "Easy"
-msgstr "સરળ"
-
-msgid "Medium"
-msgstr "મધ્યમ"
-
-msgid "Hard"
-msgstr "કઠણ"
-
-msgid "Extreme"
-msgstr "આત્યંતિક"
-
-msgid "Geography"
-msgstr "ભૂગોળ"
-
-msgid "Math"
-msgstr "ગણિત"
-
-msgid "Science"
-msgstr "વિજ્ઞાન"
-
-msgid "Computer Science"
-msgstr "કોમ્પ્યુટર સાયન્સ"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "રાજધાની"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ક્રોસવર્ડ પઝલ - રમત"
 
-#~ msgid "Countries"
-#~ msgstr "દેશો"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "સમગ્ર"
 
-#~ msgid "Easy"
-#~ msgstr "સરળ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "નીચે"
 
-#~ msgid "Medium"
-#~ msgstr "મધ્યમ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "ઉઘાડી"
 
-#~ msgid "Hard"
-#~ msgstr "કઠણ"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ઓરડું"
 
-#~ msgid "Extreme"
-#~ msgstr "આત્યંતિક"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "શબ્દ"
 
-#~ msgid "Geography"
-#~ msgstr "ભૂગોળ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ગ્રીડ"
 
-#~ msgid "Science"
-#~ msgstr "કદ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "તપાસ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "કોષ/શબ્દને તપાસવા અથવા જાહેર કરવા માટે, તમારે પહેલા કોષ પસંદ કરવો પડશે"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ચોખ્ખુ"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ક્રોસવર્ડ પઝલ - ગેમ"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "સ્માર્ટ અવગણો"
 
-#~ msgid "Across"
-#~ msgstr "સમગ્ર"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ઝૂમ પર ક્લિક કરો"
 
-#~ msgid "Down"
-#~ msgstr "નીચે"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "તમે જોઈ રહ્યા છો"
 
-#~ msgid "Reveal"
-#~ msgstr "ઉઘાડી"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "થી"
 
-#~ msgid "Cell"
-#~ msgstr "કોષ"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "માફ કરશો, શબ્દ (ઓ) દાખલ કરી શકાતો નથી."
 
-#~ msgid "Word"
-#~ msgstr "શબ્દ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "શબ્દ ગણતરી (સમાયોજિત)"
 
-#~ msgid "Grid"
-#~ msgstr "ગ્રીડ"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "શબ્દગણના"
 
-#~ msgid "Check"
-#~ msgstr "તપાસો"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ચાલુ રાખવું"
 
-#~ msgid "Clear"
-#~ msgstr "ચોખ્ખુ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "તમે ક્રોસવર્ડ પૂર્ણ કર્યો!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "સ્માર્ટ અવગણો"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ઝૂમ પર ક્લિક કરો"
+msgid "Easy"
+msgstr "સરળ"
 
-#~ msgid "You are viewing"
-#~ msgstr "તમે જોઈ રહ્યા છો"
+msgid "Medium"
+msgstr "મધ્યમ"
 
-#~ msgid "from"
-#~ msgstr "થી"
+msgid "Hard"
+msgstr "કઠણ"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "શબ્દ(ઓ) દાખલ કરી શકાયા નથી, માફ કરશો."
+msgid "Extreme"
+msgstr "આત્યંતિક"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "શબ્દ ગણતરી (વ્યવસ્થિત)"
+msgid "Geography"
+msgstr "ભૂગોળ"
 
-#~ msgid "Word count"
-#~ msgstr "શબ્દગણના"
+msgid "Math"
+msgstr "ગણિત"
 
-#~ msgid "Continue"
-#~ msgstr "ચાલુ રાખો"
+msgid "Science"
+msgstr "વિજ્ઞાન"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "તમે ક્રોસવર્ડ પૂર્ણ કર્યું!"
+msgid "Computer Science"
+msgstr "કોમ્પ્યુટર સાયન્સ"
diff --git a/crossword_puzzle/locales/ha/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ha/LC_MESSAGES/messages.mo
index 977fc2928..cf6aafb98 100644
Binary files a/crossword_puzzle/locales/ha/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ha/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ha/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ha/LC_MESSAGES/messages.po
index e7609f6d6..33d8ebc32 100644
--- a/crossword_puzzle/locales/ha/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ha/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ha <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kalmomin Kalma"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Duba kalmomin shiga"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Fita daga app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Saitunan Duniya"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Harsuna"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Girman"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "haske"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "duhu"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "tsarin"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Bayyanar"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "m"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "matalauci"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "matsakaita"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "babba"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "kamalalle"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ingancin kalmomin"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Komawa"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Load da kalmar wucewa"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Bude aikace-aikacen yanar gizo"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Kashe aikace-aikacen yanar gizo"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Zaɓuɓɓukan ƙidayar kalma"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Zaɓi ƙidayar kalma"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Matsakaicin"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Don aiwatar da wannan aikin, dole ne ka fara satan sel."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Duba"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Kusa"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "wahala"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Jimlar kalmomi"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Wahala"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Zaɓi"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Sake kunnawa"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Shin kun tabbata kuna son sake kunna app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Fita"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Shin kun tabbata kuna son fita daga app? Idan aikace-aikacen gidan yanar "
 "gizon yana gudana, za a ƙare."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Komawa gida"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Shin kun tabbata kuna son komawa kan allo na gida? Za a ƙare aikace-aikacen "
 "yanar gizon."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Kuskure"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "An riga an zaɓi wannan harshe."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "An riga an zaɓi wannan girman."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "An riga an zaɓi wannan bayyanar."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "An riga an zaɓi wannan ingancin."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Bayani"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "iya ƙare su ta hanyar Kula da Ayyuka akan MacOS, ko, kawai sake kunna "
 "kwamfutarka don ƙare su."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "samun isa ga tushen bayanan keɓaɓɓen kalmomi ne kawai lokacin da fassararsa "
 "ba ta nan a cikin kundin adireshi."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,6 +239,84 @@ msgstr ""
 "Kuskure ya faru a cikin tsararrun kalmomi. Da fatan za a duba ƙarin bayani a"
 " cikin na'ura wasan bidiyo"
 
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Tarihin Kwamareky - Wasan"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Ƙetaren"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Sauka"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Tona asiri"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cell"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Kalma"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid ɗin"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Duba"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Share"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart tsallake"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Danna don zuƙowa"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Kuna kallo"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "daga"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ba za a iya saka kalmar (s) ba, yi hakuri."
+
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kalmar kalma (gyara)"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Kirga kalma"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Ci gaba"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Kun gama fassarar!"
+
 msgid "Easy"
 msgstr "Sauƙi"
 
@@ -270,96 +340,3 @@ msgstr "Kimiyya"
 
 msgid "Computer Science"
 msgstr "Kimiyyan na'urar kwamfuta"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Babban birni"
-
-#~ msgid "Countries"
-#~ msgstr "Kasashe"
-
-#~ msgid "Easy"
-#~ msgstr "Sauƙi"
-
-#~ msgid "Medium"
-#~ msgstr "Matsakaici"
-
-#~ msgid "Hard"
-#~ msgstr "Mai wuya"
-
-#~ msgid "Extreme"
-#~ msgstr "Matsanancin"
-
-#~ msgid "Geography"
-#~ msgstr "Geography"
-
-#~ msgid "Science"
-#~ msgstr "Girman"
-
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Don duba ko bayyana tantanin halitta/kalma, dole ne ka fara zaɓar tantanin "
-#~ "halitta"
-
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Wasan Kwallon Kafa - Wasan"
-
-#~ msgid "Across"
-#~ msgstr "Ketare"
-
-#~ msgid "Down"
-#~ msgstr "Kasa"
-
-#~ msgid "Reveal"
-#~ msgstr "Bayyana"
-
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Kalma"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Duba"
-
-#~ msgid "Clear"
-#~ msgstr "Share"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart tsallake"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Danna don zuƙowa"
-
-#~ msgid "You are viewing"
-#~ msgstr "Kuna kallo"
-
-#~ msgid "from"
-#~ msgstr "daga"
-
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ba za a iya saka kalmar (s) ba, yi hakuri."
-
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Ƙididdigar kalmomi (daidaitacce)"
-
-#~ msgid "Word count"
-#~ msgstr "Ƙididdigar kalmomi"
-
-#~ msgid "Continue"
-#~ msgstr "Ci gaba"
-
-#~ msgid "You completed the crossword!"
-#~ msgstr "Kun gama ma'anar kalmar!"
diff --git a/crossword_puzzle/locales/haw/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/haw/LC_MESSAGES/messages.mo
index f32e3935d..9da6ce7d3 100644
Binary files a/crossword_puzzle/locales/haw/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/haw/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/haw/LC_MESSAGES/messages.po b/crossword_puzzle/locales/haw/LC_MESSAGES/messages.po
index 91ab89b81..ce7b4f994 100644
--- a/crossword_puzzle/locales/haw/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/haw/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: haw <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Huʻi Huaʻōlelo Crossword"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Nānā i nā huaʻōlelo"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Haʻalele i ka polokalamu"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Nā hoʻonohonoho honua"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ʻŌlelo"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Nui"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "māmā"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "pouli"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ʻōnaehana"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ka nana aku"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "weliweli"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ilihune"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Apana"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "nui"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "hemolele"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ʻO keʻano o ke aloha"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Huli Huaʻōlelo Crossword"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Hoʻi aku"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Hoʻouka i ka huaʻōlelo"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "E wehe i ka polokalamu kele pūnaewele"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "E hoʻopau i ka polokalamu kele pūnaewele"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Nā koho helu huaʻōlelo"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "E koho i ka helu ʻōlelo"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Ka nui"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Kuʻuna"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "E hana i kēia hana, ponoʻoe e koho mua i kahi kelepona."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Nānā"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Pani"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "pilikia"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Huina huaolelo"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Ka pilikia"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "E koho"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Hoʻomaka hou"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Makemake ʻoe e hoʻomaka hou i ka polokalamu?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Puka"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Makemake ʻoe e haʻalele i ka polokalamu? Inā holo ka polokalamu pūnaewele, e"
 " hoʻopau ʻia."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Hoʻi i ka home"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Makemake ʻoe e hoʻi i ka pale home? E hoʻopau ʻia ka polokalamu pūnaewele."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Kuhihewa"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ua koho ʻia kēia ʻōlelo."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ua koho mua ʻia kēia nui."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ua koho ʻia kēia hiʻohiʻona."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ua kohoʻia kēiaʻano maikaʻi."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ʻIke"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "Activity Monitor ma MacOS, a i ʻole, e hoʻomaka hou i kāu kamepiula e "
 "hoʻopau iā lākou."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "wale ka ʻikepili crossword inā ʻaʻole i loaʻa kāna mana unuhi i ka papa "
 "kuhikuhi wahi."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,6 +238,84 @@ msgstr ""
 "Loaʻa ka hewa i ka hana ʻana i nā huaʻōlelo. E ʻoluʻolu e ʻike i ka ʻike hou"
 " aku ma ka console"
 
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword puzzle - pāʻani"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Ma waena"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Iho"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Hōʻike"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Kelepona"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Hua'ōlelo"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Nānā"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Maopopo"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart skip"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kaomi aku e ZOOM"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Ke nānā neiʻoe"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "Mai"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ʻAʻole hiki ke hoʻokomoʻia nā hua'ōlelo (s), e kala mai."
+
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Helu hua'ōlelo (hoʻoponoponoʻia)"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Heluhelu nui"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "E hoʻomau"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ua hoʻopauʻoe i ka crossword!"
+
 msgid "Easy"
 msgstr "maʻalahi"
 
@@ -269,96 +339,3 @@ msgstr "ʻepekema"
 
 msgid "Computer Science"
 msgstr "ʻepekema kamepiula"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Kapena"
-
-#~ msgid "Countries"
-#~ msgstr "Nā ʻāina"
-
-#~ msgid "Easy"
-#~ msgstr "maʻalahi"
-
-#~ msgid "Medium"
-#~ msgstr "Kauwaena"
-
-#~ msgid "Hard"
-#~ msgstr "Paʻakikī"
-
-#~ msgid "Extreme"
-#~ msgstr "Kiʻekiʻe"
-
-#~ msgid "Geography"
-#~ msgstr "Palapala honua"
-
-#~ msgid "Science"
-#~ msgstr "Nui"
-
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "No ka nānā a hōʻike ʻana i kahi kelepona/huaʻōlelo, pono ʻoe e koho mua i "
-#~ "kahi kelepona"
-
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Pāʻani Crossword Puzzle - Pāʻani"
-
-#~ msgid "Across"
-#~ msgstr "Ma kēlā ʻaoʻao"
-
-#~ msgid "Down"
-#~ msgstr "I lalo"
-
-#~ msgid "Reveal"
-#~ msgstr "Hōʻike"
-
-#~ msgid "Cell"
-#~ msgstr "Kelepona"
-
-#~ msgid "Word"
-#~ msgstr "ʻŌlelo"
-
-#~ msgid "Grid"
-#~ msgstr "Māhele"
-
-#~ msgid "Check"
-#~ msgstr "Nānā"
-
-#~ msgid "Clear"
-#~ msgstr "Akaka"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kaomi aku e ZOOM"
-
-#~ msgid "You are viewing"
-#~ msgstr "Ke nānā nei ʻoe"
-
-#~ msgid "from"
-#~ msgstr "mai"
-
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ʻAʻole hiki ke hoʻokomo ʻia nā huaʻōlelo, kala mai."
-
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Helu huaʻōlelo (hoʻoponopono ʻia)"
-
-#~ msgid "Word count"
-#~ msgstr "Helu hua'ōlelo"
-
-#~ msgid "Continue"
-#~ msgstr "E hoʻomau"
-
-#~ msgid "You completed the crossword!"
-#~ msgstr "Ua hoʻopau ʻoe i ka huaʻōlelo!"
diff --git a/crossword_puzzle/locales/hi/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/hi/LC_MESSAGES/messages.mo
index c50f1d8f1..bdfb23ed8 100644
Binary files a/crossword_puzzle/locales/hi/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/hi/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/hi/LC_MESSAGES/messages.po b/crossword_puzzle/locales/hi/LC_MESSAGES/messages.po
index 0cfbe5658..a2cc6f09e 100644
--- a/crossword_puzzle/locales/hi/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/hi/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: hi <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "क्रॉसवर्ड पहेली"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "वर्ग पहेली देखें"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ऐप से बाहर निकलें"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "वैश्विक सेटिंग्स"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "बोली"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "आकार"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "रोशनी"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "अँधेरा"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "प्रणाली"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "उपस्थिति"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "भयानक"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "गरीब"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "औसत"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "महान"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "उत्तम"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "क्रॉसवर्ड गुणवत्ता"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "क्रॉसवर्ड ब्राउज़र"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "वापस जाओ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "क्रॉसवर्ड लोड करें"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "वेब ऐप खोलें"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "वेब ऐप समाप्त करें"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "शब्द गणना प्राथमिकताएँ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "शब्द गणना चुनें"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "अधिकतम"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "रिवाज़"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "इस ऑपरेशन को करने के लिए, आपको पहले एक सेल का चयन करना होगा।"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "देखना"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "बंद करना"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "कठिनाई"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "कुल शब्द"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "कठिनाई"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "चुनना"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "पुनः आरंभ करें"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "क्या आप वाकई ऐप को पुनः आरंभ करना चाहते हैं?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "बाहर निकलना"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "क्या आप वाकई ऐप से बाहर निकलना चाहते हैं? यदि वेब ऐप चल रहा है, तो इसे "
 "समाप्त कर दिया जाएगा।"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "घर वापिस जा रहा हूँ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "क्या आप वाकई होम स्क्रीन पर वापस जाना चाहते हैं? वेब ऐप समाप्त कर दिया "
 "जाएगा."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "गलती"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "यह भाषा पहले से ही चयनित है."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "यह आकार पहले से ही चयनित है."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "यह स्वरूप पहले से ही चयनित है."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "यह गुणवत्ता पहले से ही चुनी गई है।"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "जानकारी"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "किया गया है, उन्हें MacOS पर एक्टिविटी मॉनिटर के माध्यम से समाप्त किया जा "
 "सकता है, या, उन्हें समाप्त करने के लिए बस अपने कंप्यूटर को पुनरारंभ करें।"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 " बेस क्रॉसवर्ड डेटा केवल तभी एक्सेस किया जाता है जब इसका अनुवादित संस्करण "
 "लोकेशंस निर्देशिका में मौजूद नहीं होता है।"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "क्रॉसवर्ड निर्माण में एक त्रुटि उत्पन्न हुई. कृपया कंसोल में अधिक जानकारी "
 "देखें"
 
-msgid "Easy"
-msgstr "आसान"
-
-msgid "Medium"
-msgstr "मध्यम"
-
-msgid "Hard"
-msgstr "मुश्किल"
-
-msgid "Extreme"
-msgstr "चरम"
-
-msgid "Geography"
-msgstr "भूगोल"
-
-msgid "Math"
-msgstr "गणित"
-
-msgid "Science"
-msgstr "विज्ञान"
-
-msgid "Computer Science"
-msgstr "कंप्यूटर विज्ञान"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "राजधानियों"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "क्रॉसवर्ड पहेली - खेल"
 
-#~ msgid "Countries"
-#~ msgstr "देशों"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "आर-पार"
 
-#~ msgid "Easy"
-#~ msgstr "आसान"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "नीचे"
 
-#~ msgid "Medium"
-#~ msgstr "मध्यम"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "प्रकट करना"
 
-#~ msgid "Hard"
-#~ msgstr "मुश्किल"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "कक्ष"
 
-#~ msgid "Extreme"
-#~ msgstr "चरम"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "शब्द"
 
-#~ msgid "Geography"
-#~ msgstr "भूगोल"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ग्रिड"
 
-#~ msgid "Science"
-#~ msgstr "आकार"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "जाँच करना"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "किसी सेल/शब्द को जांचने या प्रकट करने के लिए, आपको पहले एक सेल का चयन करना "
-#~ "होगा"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "स्पष्ट"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "क्रॉसवर्ड पहेली - खेल"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "स्मार्ट स्किप"
 
-#~ msgid "Across"
-#~ msgstr "आर-पार"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ज़ूम पर क्लिक करें"
 
-#~ msgid "Down"
-#~ msgstr "नीचे"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "आप देख रहे हैं"
 
-#~ msgid "Reveal"
-#~ msgstr "प्रकट करना"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "से"
 
-#~ msgid "Cell"
-#~ msgstr "कक्ष"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "शब्द (ओं) को डाला नहीं जा सकता है, क्षमा करें।"
 
-#~ msgid "Word"
-#~ msgstr "शब्द"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "शब्द गणना (समायोजित)"
 
-#~ msgid "Grid"
-#~ msgstr "ग्रिड"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "शब्द गणना"
 
-#~ msgid "Check"
-#~ msgstr "जाँच करना"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "जारी रखना"
 
-#~ msgid "Clear"
-#~ msgstr "स्पष्ट"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "आपने क्रॉसवर्ड पूरा किया!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "स्मार्ट स्किप"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ज़ूम पर क्लिक करें"
+msgid "Easy"
+msgstr "आसान"
 
-#~ msgid "You are viewing"
-#~ msgstr "आप देख रहे हैं"
+msgid "Medium"
+msgstr "मध्यम"
 
-#~ msgid "from"
-#~ msgstr "से"
+msgid "Hard"
+msgstr "मुश्किल"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "शब्द(शब्दों) को सम्मिलित नहीं किया जा सका, क्षमा करें।"
+msgid "Extreme"
+msgstr "चरम"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "शब्द गणना (समायोजित)"
+msgid "Geography"
+msgstr "भूगोल"
 
-#~ msgid "Word count"
-#~ msgstr "शब्द गणना"
+msgid "Math"
+msgstr "गणित"
 
-#~ msgid "Continue"
-#~ msgstr "जारी रखना"
+msgid "Science"
+msgstr "विज्ञान"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "आपने क्रॉसवर्ड पूरा कर लिया!"
+msgid "Computer Science"
+msgstr "कंप्यूटर विज्ञान"
diff --git a/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.mo
index e9777ac45..5b98b4e87 100644
Binary files a/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.po b/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.po
index 1b34aefaa..c8c1c5cce 100644
--- a/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/hnj/LC_MESSAGES/messages.po
@@ -1,13 +1,13 @@
-# Hmong Njua translations for PROJECT.
-# Copyright (C) 2024 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
+# Hmong Njua translations crossword_puzzle.
+# Copyright (C) 2024 Tomas Vana
+# This file is distributed under the same license as the crossword_puzzle project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: hnj <LL@li.org>\n"
@@ -18,149 +18,140 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Saib crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Tawm ntawm lub app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Ntiaj teb no chaw"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Lus"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Loj"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "teeb"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tsaus ntuj"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "qhov system"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Qhov tshwm sim"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "phem"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pluag"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "xws luag"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "loj kawg"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "zoo tag nrho"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Crossword Zoo"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Rov qab mus"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Load crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Qhib web app"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Terminate web app"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Xaiv cov lus suav"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Xaiv cov lus suav"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Qhov siab tshaj plaws"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Kev cai"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Ua haujlwm ua haujlwm no, koj yuav tsum xub xaiv ntawm lub xov tooj ntawm "
 "tes."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Saib"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Kaw"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "nyuaj"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Tag nrho cov lus"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Nyuaj"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Xaiv"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Rov pib dua"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Koj puas paub tseeb tias koj xav rov pib dua lub app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Tawm"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,11 +159,11 @@ msgstr ""
 "Koj puas paub tseeb tias koj xav tawm ntawm lub app? Yog tias lub vev xaib "
 "app tab tom khiav, nws yuav raug txiav tawm."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Rov qab mus tsev"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -180,32 +171,33 @@ msgstr ""
 "Koj puas paub tseeb tias koj xav rov qab mus rau qhov screen tsev? Lub vev "
 "xaib app yuav raug txiav tawm."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "yuam kev"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Cov lus no twb xaiv lawm."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Qhov loj me no twb xaiv lawm."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Cov tsos no twb xaiv lawm."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Qhov zoo no yog twb tau xaiv."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Cov ntaub ntawv"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 "ntawm Kev Saib Xyuas Kev Ua Haujlwm ntawm macOS, lossis, tsuas yog rov pib "
 "dua koj lub khoos phis tawm kom tshem tawm lawv."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -241,7 +233,7 @@ msgstr ""
 "tau thaum nws cov lus txhais tsis muaj nyob rau hauv cov ntawv teev npe hauv"
 " zos."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -249,109 +241,104 @@ msgstr ""
 "Ib qho yuam kev tshwm sim hauv crossword tiam. Thov saib cov ntaub ntawv "
 "ntxiv hauv console"
 
-msgid "Easy"
-msgstr "Yooj yim"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Cov lus teb sib dhos ua ke - kev ua si"
 
-msgid "Medium"
-msgstr "Nruab nrab"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Dhau"
 
-msgid "Hard"
-msgstr "Nyuaj"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Nram"
 
-msgid "Extreme"
-msgstr "Heev"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Tshwm sim"
 
-msgid "Geography"
-msgstr "Geography"
-
-msgid "Math"
-msgstr "lej"
-
-msgid "Science"
-msgstr "Kev tshawb fawb"
-
-msgid "Computer Science"
-msgstr "Computer Science"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Kem hauv qhov taub"
 
-#~ msgid "Capitals"
-#~ msgstr "Cov peev"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Lo lus"
 
-#~ msgid "Countries"
-#~ msgstr "Lub teb chaws"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Daim phiaj"
 
-#~ msgid "Easy"
-#~ msgstr "Yooj yim"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kuaj"
 
-#~ msgid "Medium"
-#~ msgstr "Nruab nrab"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Meej"
 
-#~ msgid "Hard"
-#~ msgstr "Nyuaj"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Ntse Hla"
 
-#~ msgid "Extreme"
-#~ msgstr "Heev"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Nyem rau zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Koj tab tom saib"
 
-#~ msgid "Science"
-#~ msgstr "Loj"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ntawm"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Txhawm rau txheeb xyuas lossis nthuav tawm lub xov tooj / lo lus, koj yuav "
-#~ "tsum xub xaiv lub xov tooj ntawm tes"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Lo lus (s) tsis tuaj yeem tso tawm, thov txim."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Kev ua si"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Lo lus suav (kho)"
 
-#~ msgid "Across"
-#~ msgstr "Hla"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Lo lus suav"
 
-#~ msgid "Down"
-#~ msgstr "nqes"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Mus txua ntxiv"
 
-#~ msgid "Reveal"
-#~ msgstr "Qhia tawm"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Koj ua tiav cov lus hla!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Lo lus"
-
-#~ msgid "Grid"
-#~ msgstr "Daim phiaj"
-
-#~ msgid "Check"
-#~ msgstr "Tshawb xyuas"
-
-#~ msgid "Clear"
-#~ msgstr "Ntshiab"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Ntse Hla"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Nyem rau zoom"
+msgid "Easy"
+msgstr "Yooj yim"
 
-#~ msgid "You are viewing"
-#~ msgstr "Koj saib"
+msgid "Medium"
+msgstr "Nruab nrab"
 
-#~ msgid "from"
-#~ msgstr "los ntawm"
+msgid "Hard"
+msgstr "Nyuaj"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "lo lus (s) tsis tuaj yeem muab tso, thov txim."
+msgid "Extreme"
+msgstr "Heev"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Lo lus suav (hloov)"
+msgid "Geography"
+msgstr "Geography"
 
-#~ msgid "Word count"
-#~ msgstr "suav lo lus"
+msgid "Math"
+msgstr "lej"
 
-#~ msgid "Continue"
-#~ msgstr "Txuas ntxiv"
+msgid "Science"
+msgstr "Kev tshawb fawb"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Koj ua tiav qhov crossword!"
+msgid "Computer Science"
+msgstr "Computer Science"
diff --git a/crossword_puzzle/locales/hr/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/hr/LC_MESSAGES/messages.mo
index 49b85f7d6..be7399cd2 100644
Binary files a/crossword_puzzle/locales/hr/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/hr/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/hr/LC_MESSAGES/messages.po b/crossword_puzzle/locales/hr/LC_MESSAGES/messages.po
index ef5b315bf..47613a35a 100644
--- a/crossword_puzzle/locales/hr/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/hr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: hr <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Križaljka"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Pogledaj križaljke"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Izađite iz aplikacije"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globalne postavke"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Jezici"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Veličina"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "svjetlo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mračno"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sustav"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Izgled"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "strašan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "siromašan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "prosječan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Sjajno"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "savršen"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kvaliteta križaljke"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Križaljka Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Idi natrag"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Učitaj križaljku"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Otvori web aplikaciju"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Prekini web aplikaciju"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Postavke brojanja riječi"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Odaberite broj riječi"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Prilagođen"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Da biste izveli ovu operaciju, prvo morate odabrati ćeliju."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Pogled"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zatvoriti"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "poteškoća"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Ukupno riječi"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Poteškoće"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Izaberi"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Ponovno pokretanje"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Jeste li sigurni da želite ponovno pokrenuti aplikaciju?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Izlaz "
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Jeste li sigurni da želite izaći iz aplikacije? Ako je web-aplikacija "
 "pokrenuta, bit će prekinuta."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Povratak kući"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Jeste li sigurni da se želite vratiti na početni zaslon? Web-aplikacija će "
 "biti prekinuta."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Greška"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ovaj jezik je već odabran."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ova veličina je već odabrana."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ovaj izgled je već odabran."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ova je kvaliteta već odabrana."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "se prekinuti putem Activity Monitora na MacOS-u ili jednostavno ponovno "
 "pokrenite računalo da biste ih prekinuli."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "direktoriju cwords. NAPOMENA: Podacima o osnovnoj križaljci pristupa se samo"
 " kada njezina prevedena verzija nije prisutna u direktoriju lokaliteta."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Došlo je do pogreške u generiranju križaljke. Dodatne informacije potražite "
 "u konzoli"
 
-msgid "Easy"
-msgstr "Lako"
-
-msgid "Medium"
-msgstr "Srednji"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Križaljka - igra"
 
-msgid "Hard"
-msgstr "teško"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Preko"
 
-msgid "Extreme"
-msgstr "Ekstremno"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Spušteno"
 
-msgid "Geography"
-msgstr "Geografija"
-
-msgid "Math"
-msgstr "matematika"
-
-msgid "Science"
-msgstr "Znanost"
-
-msgid "Computer Science"
-msgstr "informatika"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Otkriti"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ćelija"
 
-#~ msgid "Capitals"
-#~ msgstr "Glavni gradovi"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Riječ"
 
-#~ msgid "Countries"
-#~ msgstr "zemlje"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rešetka"
 
-#~ msgid "Easy"
-#~ msgstr "Lako"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Ček"
 
-#~ msgid "Medium"
-#~ msgstr "Srednji"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Čisto"
 
-#~ msgid "Hard"
-#~ msgstr "teško"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstremno"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kliknite za zum"
 
-#~ msgid "Geography"
-#~ msgstr "Geografija"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Gledate"
 
-#~ msgid "Science"
-#~ msgstr "Veličina"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "iz"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Da biste provjerili ili otkrili ćeliju/riječ, prvo morate odabrati ćeliju"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Riječ (i) se ne može umetnuti, oprostite."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Križaljka - igra"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Broj riječi (prilagođeno)"
 
-#~ msgid "Across"
-#~ msgstr "Preko"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Brojanje riječi"
 
-#~ msgid "Down"
-#~ msgstr "dolje"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Nastaviti"
 
-#~ msgid "Reveal"
-#~ msgstr "Otkriti"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Dovršili ste križaljku!"
 
-#~ msgid "Cell"
-#~ msgstr "Ćelija"
-
-#~ msgid "Word"
-#~ msgstr "Riječ"
-
-#~ msgid "Grid"
-#~ msgstr "Mreža"
-
-#~ msgid "Check"
-#~ msgstr "Ček"
-
-#~ msgid "Clear"
-#~ msgstr "Čisto"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kliknite za zum"
+msgid "Easy"
+msgstr "Lako"
 
-#~ msgid "You are viewing"
-#~ msgstr "Vi gledate"
+msgid "Medium"
+msgstr "Srednji"
 
-#~ msgid "from"
-#~ msgstr "iz"
+msgid "Hard"
+msgstr "teško"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "riječ(i) nije bilo moguće umetnuti, nažalost."
+msgid "Extreme"
+msgstr "Ekstremno"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Broj riječi (prilagođeno)"
+msgid "Geography"
+msgstr "Geografija"
 
-#~ msgid "Word count"
-#~ msgstr "Brojanje riječi"
+msgid "Math"
+msgstr "matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Nastaviti"
+msgid "Science"
+msgstr "Znanost"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Ispunili ste križaljku!"
+msgid "Computer Science"
+msgstr "informatika"
diff --git a/crossword_puzzle/locales/hu/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/hu/LC_MESSAGES/messages.mo
index 8bb64a51c..020862480 100644
Binary files a/crossword_puzzle/locales/hu/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/hu/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/hu/LC_MESSAGES/messages.po b/crossword_puzzle/locales/hu/LC_MESSAGES/messages.po
index 09a591929..604029bbf 100644
--- a/crossword_puzzle/locales/hu/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/hu/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: hu <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Keresztrejtvény"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Keresztrejtvények megtekintése"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Lépjen ki az alkalmazásból"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Általános beállítások"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Nyelvek"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Méret"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "fény"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "sötét"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "rendszer"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Kinézet"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "szörnyű"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "szegény"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "átlagos"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "nagy"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "tökéletes"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Keresztrejtvényminőség"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Keresztrejtvény böngésző"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Menjen vissza"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Töltsön be keresztrejtvényt"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Nyissa meg a webalkalmazást"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "A webalkalmazás megszüntetése"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Szószám-beállítások"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Válassza ki a szavak számát"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximális"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Egyedi"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "A művelet végrehajtásához először ki kell választania egy cellát."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Kilátás"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Bezárás"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "nehézség"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Összes szó"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Nehézség"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Válassza ki"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Újrakezd"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Biztosan újra akarja indítani az alkalmazást?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Kijárat"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Biztosan ki akar lépni az alkalmazásból? Ha a webalkalmazás fut, akkor "
 "leáll."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Vissza a főoldalra"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Biztosan vissza akar térni a kezdőképernyőre? A webalkalmazás megszűnik."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Hiba"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ez a nyelv már ki van választva."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ez a méret már ki van választva."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ez a megjelenés már ki van választva."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ezt a minőséget már kiválasztották."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "segítségével MacOS rendszeren, vagy egyszerűen indítsa újra a számítógépet a"
 " leállításukhoz."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "MEGJEGYZÉS: Az alap keresztrejtvényadatokhoz csak akkor lehet hozzáférni, ha"
 " a lefordított verzió nem szerepel a locales könyvtárban."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Hiba történt a keresztrejtvény generálása során. További információkat a "
 "konzolon talál"
 
-msgid "Easy"
-msgstr "Könnyen"
-
-msgid "Medium"
-msgstr "Közepes"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Keresztrejtvény - játék"
 
-msgid "Hard"
-msgstr "Kemény"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Át"
 
-msgid "Extreme"
-msgstr "Szélső"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Le"
 
-msgid "Geography"
-msgstr "Földrajz"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Tudomány"
-
-msgid "Computer Science"
-msgstr "Számítástechnika"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "felfed"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sejt"
 
-#~ msgid "Capitals"
-#~ msgstr "Tőkék"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Szó"
 
-#~ msgid "Countries"
-#~ msgstr "Országok"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rács"
 
-#~ msgid "Easy"
-#~ msgstr "Könnyen"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Jelölje be"
 
-#~ msgid "Medium"
-#~ msgstr "Közepes"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Egyértelmű"
 
-#~ msgid "Hard"
-#~ msgstr "Kemény"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Intelligens kihagyás"
 
-#~ msgid "Extreme"
-#~ msgstr "Szélső"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kattintson a Zoomra"
 
-#~ msgid "Geography"
-#~ msgstr "Földrajz"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Te nézel"
 
-#~ msgid "Science"
-#~ msgstr "Méret"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "tól től"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Egy cella/szó ellenőrzéséhez vagy felfedéséhez először ki kell választania "
-#~ "egy cellát"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "A szót (ek) nem lehetett beilleszteni, sajnálom."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Keresztrejtvény - Játék"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Szószám (beállított)"
 
-#~ msgid "Across"
-#~ msgstr "Át"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Szavak száma"
 
-#~ msgid "Down"
-#~ msgstr "Le"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Folytatni"
 
-#~ msgid "Reveal"
-#~ msgstr "felfed"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Befejezte a keresztrejtvényt!"
 
-#~ msgid "Cell"
-#~ msgstr "Sejt"
-
-#~ msgid "Word"
-#~ msgstr "Szó"
-
-#~ msgid "Grid"
-#~ msgstr "Rács"
-
-#~ msgid "Check"
-#~ msgstr "Jelölje be"
-
-#~ msgid "Clear"
-#~ msgstr "Egyértelmű"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Intelligens kihagyás"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kattintson a ZOOM gombra"
+msgid "Easy"
+msgstr "Könnyen"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ön nézi"
+msgid "Medium"
+msgstr "Közepes"
 
-#~ msgid "from"
-#~ msgstr "tól től"
+msgid "Hard"
+msgstr "Kemény"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "szó(k) beszúrása nem sikerült, sajnálom."
+msgid "Extreme"
+msgstr "Szélső"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Szószám (korrigált)"
+msgid "Geography"
+msgstr "Földrajz"
 
-#~ msgid "Word count"
-#~ msgstr "Szavak száma"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Folytatni"
+msgid "Science"
+msgstr "Tudomány"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Kitöltötted a keresztrejtvényt!"
+msgid "Computer Science"
+msgstr "Számítástechnika"
diff --git a/crossword_puzzle/locales/hy/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/hy/LC_MESSAGES/messages.mo
index ccc61df2a..7204875a7 100644
Binary files a/crossword_puzzle/locales/hy/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/hy/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/hy/LC_MESSAGES/messages.po b/crossword_puzzle/locales/hy/LC_MESSAGES/messages.po
index 2f4213d76..7701fb10e 100644
--- a/crossword_puzzle/locales/hy/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/hy/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: hy <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Խաչբառ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Դիտեք խաչբառերը"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Դուրս եկեք հավելվածից"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Համաշխարհային կարգավորումներ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Լեզուներ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Չափը"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "լույս"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "մութ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "համակարգ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Արտաքին տեսք"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "սարսափելի"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "աղքատ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "միջին"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "հիանալի"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "կատարյալ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Խաչբառերի որակ"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Խաչբառ զննարկիչ"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Վերադառնալ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Բեռնել խաչբառ"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Բացեք վեբ հավելվածը"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Դադարեցրեք վեբ հավելվածը"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Բառերի քանակի նախապատվություններ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Ընտրեք բառերի քանակը"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Առավելագույնը"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Պատվերով"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Այս գործողությունը կատարելու համար նախ պետք է բջիջ ընտրեք:"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Դիտել"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "փակել"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "դժվարություն"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Ընդհանուր բառեր"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Դժվարություն"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Ընտրել"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Վերսկսել"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Իսկապե՞ս ուզում եք վերագործարկել հավելվածը:"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ելք"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Իսկապե՞ս ուզում եք դուրս գալ հավելվածից: Եթե վեբ հավելվածն աշխատում է, այն "
 "կդադարեցվի:"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Վերադարձ դեպի տուն"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Իսկապե՞ս ուզում եք վերադառնալ հիմնական էկրան: Վեբ հավելվածը կդադարեցվի:"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Սխալ"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Այս լեզուն արդեն ընտրված է:"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Այս չափն արդեն ընտրված է։"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Այս տեսքն արդեն ընտրված է:"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Այս որակը արդեն ընտրված է:"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Ինֆո"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 " դադարեցվել MacOS-ում Activity Monitor-ի միջոցով կամ պարզապես վերագործարկեք "
 "ձեր համակարգիչը՝ դրանք դադարեցնելու համար:"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "ԾԱՆՈԹՈՒԹՅՈՒՆ. Հիմնական խաչբառի տվյալները հասանելի են միայն այն դեպքում, երբ "
 "դրանց թարգմանված տարբերակը բացակայում է տեղանքների գրացուցակում:"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,117 +237,104 @@ msgstr ""
 "Խաչբառի ստեղծման ժամանակ սխալ է տեղի ունեցել: Խնդրում ենք տեսնել լրացուցիչ "
 "տեղեկություններ վահանակում"
 
-msgid "Easy"
-msgstr "Հեշտ"
-
-msgid "Medium"
-msgstr "Միջին"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Խաչբառ հանելուկ - խաղ"
 
-msgid "Hard"
-msgstr "Դժվար"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Միջով"
 
-msgid "Extreme"
-msgstr "Ծայրահեղ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ներքեվ"
 
-msgid "Geography"
-msgstr "Աշխարհագրություն"
-
-msgid "Math"
-msgstr "Մաթեմատիկա"
-
-msgid "Science"
-msgstr "Գիտություն"
-
-msgid "Computer Science"
-msgstr "Համակարգչային գիտություն"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Բացահայտել"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Բջիջ"
 
-#~ msgid "Capitals"
-#~ msgstr "Մայրաքաղաքներ"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Բանաձեվ"
 
-#~ msgid "Countries"
-#~ msgstr "Երկրներ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Ցանց"
 
-#~ msgid "Easy"
-#~ msgstr "Հեշտ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Ստուգում"
 
-#~ msgid "Medium"
-#~ msgstr "Միջին"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Պարզ"
 
-#~ msgid "Hard"
-#~ msgstr "Դժվար"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Ծայրահեղ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Կտտացրեք մեծացնելու համար"
 
-#~ msgid "Geography"
-#~ msgstr "Աշխարհագրություն"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Դուք դիտում եք"
 
-#~ msgid "Science"
-#~ msgstr "Չափը"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "դեպի"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Բջիջ/բառ ստուգելու կամ բացահայտելու համար նախ պետք է բջիջ ընտրել"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Բառ (ներ) ը հնարավոր չէ տեղադրել, կներեք:"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Խաչբառ հանելուկ - Խաղ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Բառի հաշվարկ (ճշգրտված)"
 
-#~ msgid "Across"
-#~ msgstr "Ողջ"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Բառի հաշվիչ"
 
-#~ msgid "Down"
-#~ msgstr "Ներքև"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Շարունակել"
 
-#~ msgid "Reveal"
-#~ msgstr "Բացահայտել"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Դուք ավարտեցիք խաչբառ:"
 
-#~ msgid "Cell"
-#~ msgstr "Բջջ"
-
-#~ msgid "Word"
-#~ msgstr "Խոսք"
-
-#~ msgid "Grid"
-#~ msgstr "Ցանց"
-
-#~ msgid "Check"
-#~ msgstr "Ստուգեք"
-
-#~ msgid "Clear"
-#~ msgstr "Պարզ"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Կտտացրեք մեծացնելու համար"
+msgid "Easy"
+msgstr "Հեշտ"
 
-#~ msgid "You are viewing"
-#~ msgstr "Դուք դիտում եք"
+msgid "Medium"
+msgstr "Միջին"
 
-#~ msgid "from"
-#~ msgstr "-ից"
+msgid "Hard"
+msgstr "Դժվար"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "բառ(եր) չհաջողվեց տեղադրել, կներեք:"
+msgid "Extreme"
+msgstr "Ծայրահեղ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Բառերի հաշվարկ (ճշգրտված)"
+msgid "Geography"
+msgstr "Աշխարհագրություն"
 
-#~ msgid "Word count"
-#~ msgstr "Բառի հաշվիչ"
+msgid "Math"
+msgstr "Մաթեմատիկա"
 
-#~ msgid "Continue"
-#~ msgstr "Շարունակել"
+msgid "Science"
+msgstr "Գիտություն"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Դուք լրացրեցիք խաչբառը:"
+msgid "Computer Science"
+msgstr "Համակարգչային գիտություն"
diff --git a/crossword_puzzle/locales/id/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/id/LC_MESSAGES/messages.mo
index 6e24e1be1..7f6668bdd 100644
Binary files a/crossword_puzzle/locales/id/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/id/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/id/LC_MESSAGES/messages.po b/crossword_puzzle/locales/id/LC_MESSAGES/messages.po
index 2a3701d27..57c97b3bc 100644
--- a/crossword_puzzle/locales/id/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/id/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: id <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Teka teki silang"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Lihat teka-teki silang"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Keluar dari aplikasi"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Pengaturan global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Bahasa"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Ukuran"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lampu"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "gelap"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Penampilan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "sangat buruk"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "miskin"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "rata-rata"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Besar"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "sempurna"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kualitas silang"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Peramban Teka-Teki Silang"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Kembali"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Muat teka-teki silang"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Buka aplikasi web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Hentikan aplikasi web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferensi jumlah kata"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pilih jumlah kata"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Kebiasaan"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Untuk melakukan operasi ini, Anda harus terlebih dahulu memilih sel."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Melihat"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Menutup"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kesulitan"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Jumlah kata"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Kesulitan"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pilih"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Mengulang kembali"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Apakah Anda yakin ingin memulai ulang aplikasi?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "KELUAR"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Apakah Anda yakin ingin keluar dari aplikasi? Jika aplikasi web sedang "
 "berjalan, itu akan dihentikan."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Kembali ke rumah"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Apakah Anda yakin ingin kembali ke layar beranda? Aplikasi web akan "
 "dihentikan."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Kesalahan"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Bahasa ini sudah dipilih."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ukuran ini sudah dipilih."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Tampilan ini sudah dipilih."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kualitas ini sudah dipilih."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informasi"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "Activity Monitor di MacOS, atau cukup restart komputer Anda untuk "
 "menghentikannya."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "JSON definisinya ada di direktori kata dasar. CATATAN: Data teka-teki silang"
 " dasar hanya diakses bila versi terjemahannya tidak ada di direktori lokal."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,6 +238,84 @@ msgstr ""
 "Terjadi kesalahan dalam pembuatan teka-teki silang. Silakan lihat informasi "
 "lebih lanjut di konsol"
 
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle Crossword - Game"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Lintas"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Turun"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Mengungkap"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sel"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Kata"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Kisi"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Memeriksa"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Jernih"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Lewati Cerdas"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klik untuk memperbesar"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Anda melihat"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "dari"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Word tidak dapat dimasukkan, maaf."
+
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Jumlah kata (disesuaikan)"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Jumlah kata"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Melanjutkan"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Anda menyelesaikan teka -teki silang!"
+
 msgid "Easy"
 msgstr "Mudah"
 
@@ -269,96 +339,3 @@ msgstr "Sains"
 
 msgid "Computer Science"
 msgstr "Ilmu Komputer"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Ibukota"
-
-#~ msgid "Countries"
-#~ msgstr "Negara"
-
-#~ msgid "Easy"
-#~ msgstr "Mudah"
-
-#~ msgid "Medium"
-#~ msgstr "Sedang"
-
-#~ msgid "Hard"
-#~ msgstr "Keras"
-
-#~ msgid "Extreme"
-#~ msgstr "Ekstrim"
-
-#~ msgid "Geography"
-#~ msgstr "Geografi"
-
-#~ msgid "Science"
-#~ msgstr "Ukuran"
-
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Untuk memeriksa atau menampilkan sel/kata, Anda harus memilih sel terlebih "
-#~ "dahulu"
-
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Teka-teki Silang - Permainan"
-
-#~ msgid "Across"
-#~ msgstr "Lintas"
-
-#~ msgid "Down"
-#~ msgstr "Turun"
-
-#~ msgid "Reveal"
-#~ msgstr "Mengungkap"
-
-#~ msgid "Cell"
-#~ msgstr "Sel"
-
-#~ msgid "Word"
-#~ msgstr "Kata"
-
-#~ msgid "Grid"
-#~ msgstr "jaringan"
-
-#~ msgid "Check"
-#~ msgstr "Memeriksa"
-
-#~ msgid "Clear"
-#~ msgstr "Jernih"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Lewati Cerdas"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klik untuk memperbesar"
-
-#~ msgid "You are viewing"
-#~ msgstr "Anda sedang melihat"
-
-#~ msgid "from"
-#~ msgstr "dari"
-
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "kata-kata tidak dapat dimasukkan, maaf."
-
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Jumlah kata (disesuaikan)"
-
-#~ msgid "Word count"
-#~ msgstr "Jumlah kata"
-
-#~ msgid "Continue"
-#~ msgstr "Melanjutkan"
-
-#~ msgid "You completed the crossword!"
-#~ msgstr "Anda menyelesaikan teka-teki silang!"
diff --git a/crossword_puzzle/locales/ig/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ig/LC_MESSAGES/messages.mo
index 51c0e03f1..5933146c6 100644
Binary files a/crossword_puzzle/locales/ig/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ig/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ig/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ig/LC_MESSAGES/messages.po
index 664fc63b0..cadba2536 100644
--- a/crossword_puzzle/locales/ig/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ig/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ig <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Okwu mgbagwoju anya"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Lelee okwu mkparịta ụka"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Wepụ ngwa ahụ"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Ntọala zuru ụwa ọnụ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Asụsụ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Nha"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ìhè"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ọchịchịrị"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "usoro"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ọdịdị"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "kemmenyeujo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "emezighi"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "agbaetiti"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "keuwu"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "zuruoke"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ogo Crossword"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Ihe nchọgharị okwu crossword"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Laghachi azụ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Ibu okwu ntughari"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Mepee ngwa weebụ"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Kwụsị ngwa weebụ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Mmasị ọnụọgụ okwu"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Họrọ ọnụ ọgụgụ okwu"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Kachasị"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Omenala"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Iji rụọ ọrụ a, ị ga-ebu ụzọ họrọ sel."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Lelee"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Mechie"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ike"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Mkpokọta okwu"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Ihe isi ike"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Họrọ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Malitegharịa ekwentị"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ị ji n'aka na ịchọrọ ịmalitegharị ngwa ahụ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ụzọ ọpụpụ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Ị ji n'aka na ịchọrọ ịpụ na ngwa ahụ? Ọ bụrụ na ngwa weebụ na-agba ọsọ, a "
 "ga-akwụsị ya."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Laghachi n'ụlọ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Ị ji n'aka na ịchọrọ ịlaghachi na ihuenyo ụlọ? A ga-akwụsị ngwa weebụ."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Njehie"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Asụsụ a ahọpụtalarị."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ahọpụtala nha a."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ahọpụtalarị ọdịdị a."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ahọrọla ogo a."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Ozi"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -224,7 +216,7 @@ msgstr ""
 "akwụsịbeghị nke ọma site na Monitor Activity na MacOS, ma ọ bụ, malitegharịa"
 " kọmputa gị naanị ka ịkwụsị ya."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -235,123 +227,110 @@ msgstr ""
 "nkọwapụta ya faịlụ JSON dị na akwụkwọ ndekọ aha ntọala. IHE: A na-enweta "
 "data crossword base naanị mgbe ụdị ntụgharị ya adịghị na ndekọ mpaghara."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "Njehie mere na ọgbọ okwu. Biko hụ ozi ndị ọzọ na njikwa"
 
-msgid "Easy"
-msgstr "Mfe"
-
-msgid "Medium"
-msgstr "Ọkara"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Egwuregwu Crossword - Ga egwuregwu"
 
-msgid "Hard"
-msgstr "siri ike"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Uhie"
 
-msgid "Extreme"
-msgstr "Oke"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ala"
 
-msgid "Geography"
-msgstr "Geography"
-
-msgid "Math"
-msgstr "mgbakọ na mwepụ"
-
-msgid "Science"
-msgstr "Sayensị"
-
-msgid "Computer Science"
-msgstr "Kọmputa sayensị"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ikpugbe"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Seelu"
 
-#~ msgid "Capitals"
-#~ msgstr "Isi obodo"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Mkpuruokwu"
 
-#~ msgid "Countries"
-#~ msgstr "Mba"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Guo"
 
-#~ msgid "Easy"
-#~ msgstr "Mfe"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Nleru anya"
 
-#~ msgid "Medium"
-#~ msgstr "Ọkara"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Agwa idiocha"
 
-#~ msgid "Hard"
-#~ msgstr "siri ike"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skill"
 
-#~ msgid "Extreme"
-#~ msgstr "Oke"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Pịa ka ị bia"
 
-#~ msgid "Geography"
-#~ msgstr "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Ị na-elele"
 
-#~ msgid "Science"
-#~ msgstr "Nha"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "site na"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Ka ịlele ma ọ bụ ikpughe cell/okwu, ị ga-ebu ụzọ họrọ cell"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Enweghị ike itinye okwu (s), ndo."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Okwu mgbagwoju anya - Egwuregwu"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Guagn Gua (Gbanwee)"
 
-#~ msgid "Across"
-#~ msgstr "N'ofe"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Guage"
 
-#~ msgid "Down"
-#~ msgstr "Ala"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Isochi"
 
-#~ msgid "Reveal"
-#~ msgstr "kpughere"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "I zuru oke!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Okwu"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Lelee"
-
-#~ msgid "Clear"
-#~ msgstr "Kpochapụ"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skill"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Pịa ka ị bia"
+msgid "Easy"
+msgstr "Mfe"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ị na-ekiri"
+msgid "Medium"
+msgstr "Ọkara"
 
-#~ msgid "from"
-#~ msgstr "si"
+msgid "Hard"
+msgstr "siri ike"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "enweghị ike itinye okwu(s), ndo."
+msgid "Extreme"
+msgstr "Oke"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Ọnụọgụ okwu (gbanwere)"
+msgid "Geography"
+msgstr "Geography"
 
-#~ msgid "Word count"
-#~ msgstr "Ọnụ okwu"
+msgid "Math"
+msgstr "mgbakọ na mwepụ"
 
-#~ msgid "Continue"
-#~ msgstr "Gaa n'ihu"
+msgid "Science"
+msgstr "Sayensị"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Ị mechaala okwu mkparịta ụka!"
+msgid "Computer Science"
+msgstr "Kọmputa sayensị"
diff --git a/crossword_puzzle/locales/is/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/is/LC_MESSAGES/messages.mo
index 66c8076bf..1c58b3206 100644
Binary files a/crossword_puzzle/locales/is/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/is/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/is/LC_MESSAGES/messages.po b/crossword_puzzle/locales/is/LC_MESSAGES/messages.po
index 02bbaa5cb..c26c3c61b 100644
--- a/crossword_puzzle/locales/is/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/is/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: is <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n%10==1 && n%100!=11 ? 0 : 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krossgáta"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Skoða krossgátur"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Lokaðu appinu"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Alþjóðlegar stillingar"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Tungumál"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Stærð"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ljós"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "Myrkur"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "kerfi"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Útlit"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "hræðilegt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "Aumingja"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "meðaltal"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "frábært"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "Fullkomið"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krossgátu gæði"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Krossgátuvafri"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Farðu til baka"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Hlaða krossgátu"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Opnaðu vefforrit"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Lokaðu vefforriti"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Orðafjöldavalkostir"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Veldu orðafjölda"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Hámark"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Sérsniðin"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Til að framkvæma þessa aðgerð verður þú fyrst að velja klefa."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Útsýni"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Loka"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "erfiðleikar"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Samtals orð"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Erfiðleikar"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Veldu"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Endurræsa"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ertu viss um að þú viljir endurræsa forritið?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Hætta"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ertu viss um að þú viljir hætta í forritinu? Ef vefforritið er í gangi "
 "verður því lokað."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Aftur heim"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ertu viss um að þú viljir fara aftur á heimaskjáinn? Vefforritinu verður "
 "lokað."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Villa"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Þetta tungumál er þegar valið."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Þessi stærð er þegar valin."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Þetta útlit er þegar valið."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Þessi gæði eru þegar valin."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Upplýsingar"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 " í gegnum Activity Monitor á MacOS, eða einfaldlega endurræsa tölvuna þína "
 "til að loka þeim."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "ATHUGIÐ: Grunnkrossgátugögn eru aðeins opnuð þegar þýdd útgáfa þeirra er "
 "ekki til í staðsetningarskránni."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,117 +238,104 @@ msgstr ""
 "Villa kom upp í krossgátugerð. Vinsamlegast sjáðu frekari upplýsingar í "
 "stjórnborðinu"
 
-msgid "Easy"
-msgstr "Auðvelt"
-
-msgid "Medium"
-msgstr "Miðlungs"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krossgátu - leikur"
 
-msgid "Hard"
-msgstr "Erfitt"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Yfir"
 
-msgid "Extreme"
-msgstr "Öfgafullt"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Niður"
 
-msgid "Geography"
-msgstr "Landafræði"
-
-msgid "Math"
-msgstr "Stærðfræði"
-
-msgid "Science"
-msgstr "Vísindi"
-
-msgid "Computer Science"
-msgstr "Tölvu vísindi"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Afhjúpa"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cell"
 
-#~ msgid "Capitals"
-#~ msgstr "Höfuðborgir"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Orð"
 
-#~ msgid "Countries"
-#~ msgstr "Lönd"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rist"
 
-#~ msgid "Easy"
-#~ msgstr "Auðvelt"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Athugaðu"
 
-#~ msgid "Medium"
-#~ msgstr "Miðlungs"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Tær"
 
-#~ msgid "Hard"
-#~ msgstr "Erfitt"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Snjall sleppi"
 
-#~ msgid "Extreme"
-#~ msgstr "Öfgafullt"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Smelltu til að zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Landafræði"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Þú ert að skoða"
 
-#~ msgid "Science"
-#~ msgstr "Stærð"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "Frá"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Til að athuga eða sýna reit/orð verður þú fyrst að velja reit"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ekki var hægt að setja orð (s), því miður."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krossgátu - Leikur"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Orðafjöldi (leiðrétt)"
 
-#~ msgid "Across"
-#~ msgstr "Þvert yfir"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Orða talning"
 
-#~ msgid "Down"
-#~ msgstr "Niður"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Haltu áfram"
 
-#~ msgid "Reveal"
-#~ msgstr "Afhjúpa"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Þú kláraðir krossgátuna!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Orð"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Athugaðu"
-
-#~ msgid "Clear"
-#~ msgstr "Hreinsa"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Snjall sleppi"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Smelltu til að zoom"
+msgid "Easy"
+msgstr "Auðvelt"
 
-#~ msgid "You are viewing"
-#~ msgstr "Þú ert að skoða"
+msgid "Medium"
+msgstr "Miðlungs"
 
-#~ msgid "from"
-#~ msgstr "frá"
+msgid "Hard"
+msgstr "Erfitt"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Ekki var hægt að setja inn orð, því miður."
+msgid "Extreme"
+msgstr "Öfgafullt"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Orðafjöldi (leiðrétt)"
+msgid "Geography"
+msgstr "Landafræði"
 
-#~ msgid "Word count"
-#~ msgstr "Orða talning"
+msgid "Math"
+msgstr "Stærðfræði"
 
-#~ msgid "Continue"
-#~ msgstr "Halda áfram"
+msgid "Science"
+msgstr "Vísindi"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Þú kláraðir krossgátuna!"
+msgid "Computer Science"
+msgstr "Tölvu vísindi"
diff --git a/crossword_puzzle/locales/it/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/it/LC_MESSAGES/messages.mo
index ec7154f48..c8f24c8b8 100644
Binary files a/crossword_puzzle/locales/it/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/it/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/it/LC_MESSAGES/messages.po b/crossword_puzzle/locales/it/LC_MESSAGES/messages.po
index f7732b3e9..aca57d7bb 100644
--- a/crossword_puzzle/locales/it/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/it/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: it <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Parole crociate"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Visualizza i cruciverba"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Esci dall'app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Impostazioni globali"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Le lingue"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Misurare"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "leggero"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "buio"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aspetto"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "terribile"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "povero"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "nella media"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "fantastico"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfetto"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Qualità dei cruciverba"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Navigatore di cruciverba"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Torna indietro"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Carica il cruciverba"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Apri l'app Web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Termina l'app Web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferenze sul conteggio delle parole"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Seleziona il conteggio delle parole"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Massimo"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Costume"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Per eseguire questa operazione, è necessario prima selezionare una cella."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Visualizzazione"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Vicino"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "difficoltà"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Parole totali"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Difficoltà"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Selezionare"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Ricomincia"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Sei sicuro di voler riavviare l'app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Uscita"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,11 +159,11 @@ msgstr ""
 "Sei sicuro di voler uscire dall'app? Se l'app Web è in esecuzione, verrà "
 "terminata."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Tornare a casa"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -180,32 +171,33 @@ msgstr ""
 "Sei sicuro di voler tornare alla schermata principale? L'app Web verrà "
 "terminata."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Errore"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Questa lingua è già selezionata."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Questa dimensione è già selezionata."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Questo aspetto è già selezionato."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Questa qualità è già selezionata."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informazioni"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "possono essere terminati tramite Activity Monitor su MacOS o semplicemente "
 "riavviando il computer per terminarli."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "base solo quando la versione tradotta non è presente nella directory "
 "locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Si è verificato un errore durante la generazione del cruciverba. Si prega di"
 " consultare ulteriori informazioni nella console"
 
-msgid "Easy"
-msgstr "Facile"
-
-msgid "Medium"
-msgstr "medio"
-
-msgid "Hard"
-msgstr "Difficile"
-
-msgid "Extreme"
-msgstr "Estremo"
-
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matematica"
-
-msgid "Science"
-msgstr "Scienza"
-
-msgid "Computer Science"
-msgstr "Informatica"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Capitali"
-
-#~ msgid "Countries"
-#~ msgstr "Paesi"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Cruciverba - Gioco"
 
-#~ msgid "Easy"
-#~ msgstr "Facile"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Attraverso"
 
-#~ msgid "Medium"
-#~ msgstr "medio"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Giù"
 
-#~ msgid "Hard"
-#~ msgstr "Difficile"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Rivelare"
 
-#~ msgid "Extreme"
-#~ msgstr "Estremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr ""
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Parola"
 
-#~ msgid "Science"
-#~ msgstr "Misurare"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Griglia"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Per controllare o rivelare una cella/parola, devi prima selezionare una "
-#~ "cella"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Verifica"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Cruciverba - Gioco"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Cancella"
 
-#~ msgid "Across"
-#~ msgstr "Attraverso"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Salta intelligente"
 
-#~ msgid "Down"
-#~ msgstr "Giù"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Fare clic per ingrandire"
 
-#~ msgid "Reveal"
-#~ msgstr "Svelare"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Stai visualizzando"
 
-#~ msgid "Cell"
-#~ msgstr "Cellula"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "da"
 
-#~ msgid "Word"
-#~ msgstr "Parola"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "impossibile inserire la parola, siamo spiacenti."
 
-#~ msgid "Grid"
-#~ msgstr "Griglia"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Conteggio parole (aggiustato)"
 
-#~ msgid "Check"
-#~ msgstr "Controllo"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Conteggio delle parole"
 
-#~ msgid "Clear"
-#~ msgstr "Chiaro"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continua"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Salta intelligente"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Hai completato il cruciverba!"
 
-#~ msgid "Click To Zoom"
-#~ msgstr "Fai clic per zoom"
+msgid "Easy"
+msgstr "Facile"
 
-#~ msgid "You are viewing"
-#~ msgstr "Stai visualizzando"
+msgid "Medium"
+msgstr "medio"
 
-#~ msgid "from"
-#~ msgstr "da"
+msgid "Hard"
+msgstr "Difficile"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Impossibile inserire la parola, siamo spiacenti."
+msgid "Extreme"
+msgstr "Estremo"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Conteggio parole (aggiustato)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Conteggio delle parole"
+msgid "Math"
+msgstr "Matematica"
 
-#~ msgid "Continue"
-#~ msgstr "Continua"
+msgid "Science"
+msgstr "Scienza"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Hai completato il cruciverba!"
+msgid "Computer Science"
+msgstr "Informatica"
diff --git a/crossword_puzzle/locales/ja/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ja/LC_MESSAGES/messages.mo
index 250c83625..b04161384 100644
Binary files a/crossword_puzzle/locales/ja/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ja/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ja/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ja/LC_MESSAGES/messages.po
index b901705af..bfc92ba97 100644
--- a/crossword_puzzle/locales/ja/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ja/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ja <LL@li.org>\n"
@@ -19,188 +19,180 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "クロスワードパズル"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "クロスワードを表示する"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "アプリを終了する"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "全体設定"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "言語"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "サイズ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ライト"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "暗い"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "システム"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "外観"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ひどい"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "貧しい"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "平均"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "素晴らしい"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "完璧"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "クロスワード品質"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "クロスワードブラウザ"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "戻る"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "クロスワードをロードする"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ウェブアプリを開く"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Webアプリを終了する"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "文字数の設定"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "文字数を選択してください"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "最大"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "カスタム"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "この操作を実行するには、最初にセルを選択する必要があります。"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ビュー"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "近い"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "困難"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "総単語数"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "困難"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "選択する"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "再起動"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "アプリを再起動してもよろしいですか?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "出口"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr "アプリを終了してもよろしいですか? Web アプリが実行中の場合は終了します。"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "家に帰る"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "ホーム画面に戻ってもよろしいですか? Webアプリが終了します。"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "エラー"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "この言語はすでに選択されています。"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "このサイズはすでに選択されています。"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "この外観はすでに選択されています。"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "この品質はすでに選択されています。"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "情報"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -218,7 +210,7 @@ msgstr ""
 "アプリを実行します。あるいは、プログラムの構成ファイル内のポートを手動で変更することもできます。適切に終了されていないすべてのアプリ "
 "プロセスは、MacOS のアクティビティ モニターを通じて終了するか、コンピュータを再起動するだけで終了できます。"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -229,123 +221,110 @@ msgstr ""
 "ディレクトリに存在することを確認してください。注: 基本クロスワード データは、その翻訳バージョンがロケール "
 "ディレクトリに存在しない場合にのみアクセスされます。"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "クロスワード生成でエラーが発生しました。コンソールで詳細を確認してください"
 
-msgid "Easy"
-msgstr "簡単"
-
-msgid "Medium"
-msgstr "中くらい"
-
-msgid "Hard"
-msgstr "難しい"
-
-msgid "Extreme"
-msgstr "過激"
-
-msgid "Geography"
-msgstr "地理"
-
-msgid "Math"
-msgstr "数学"
-
-msgid "Science"
-msgstr "科学"
-
-msgid "Computer Science"
-msgstr "コンピュータサイエンス"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "首都"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "クロスワードパズル - ゲーム"
 
-#~ msgid "Countries"
-#~ msgstr "国"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "横切って"
 
-#~ msgid "Easy"
-#~ msgstr "簡単"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "下"
 
-#~ msgid "Medium"
-#~ msgstr "中くらい"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "明らかにする"
 
-#~ msgid "Hard"
-#~ msgstr "難しい"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "細胞"
 
-#~ msgid "Extreme"
-#~ msgstr "過激"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "言葉"
 
-#~ msgid "Geography"
-#~ msgstr "地理"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "グリッド"
 
-#~ msgid "Science"
-#~ msgstr "サイズ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "チェック"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "セル/単語をチェックまたは表示するには、まずセルを選択する必要があります"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "クリア"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "クロスワード パズル - ゲーム"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "スマートスキップ"
 
-#~ msgid "Across"
-#~ msgstr "横切って"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "クリックしてズームします"
 
-#~ msgid "Down"
-#~ msgstr "下"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "あなたは見ています"
 
-#~ msgid "Reveal"
-#~ msgstr "明らかにする"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "から"
 
-#~ msgid "Cell"
-#~ msgstr "細胞"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "単語を挿入できませんでした、ごめんなさい。"
 
-#~ msgid "Word"
-#~ msgstr "言葉"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "ワードカウント（調整）"
 
-#~ msgid "Grid"
-#~ msgstr "グリッド"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "単語数"
 
-#~ msgid "Check"
-#~ msgstr "チェック"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "続く"
 
-#~ msgid "Clear"
-#~ msgstr "クリア"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "クロスワードを完成させました！"
 
-#~ msgid "Smart Skip"
-#~ msgstr "スマートスキップ"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "クリックしてズームします"
+msgid "Easy"
+msgstr "簡単"
 
-#~ msgid "You are viewing"
-#~ msgstr "あなたは閲覧しています"
+msgid "Medium"
+msgstr "中くらい"
 
-#~ msgid "from"
-#~ msgstr "から"
+msgid "Hard"
+msgstr "難しい"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "単語を挿入できませんでした。申し訳ありません。"
+msgid "Extreme"
+msgstr "過激"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "文字数（調整済み）"
+msgid "Geography"
+msgstr "地理"
 
-#~ msgid "Word count"
-#~ msgstr "単語数"
+msgid "Math"
+msgstr "数学"
 
-#~ msgid "Continue"
-#~ msgstr "続く"
+msgid "Science"
+msgstr "科学"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "クロスワードを完成させました!"
+msgid "Computer Science"
+msgstr "コンピュータサイエンス"
diff --git a/crossword_puzzle/locales/jw/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/jw/LC_MESSAGES/messages.mo
index b526ad93b..05a8601d0 100644
Binary files a/crossword_puzzle/locales/jw/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/jw/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/jw/LC_MESSAGES/messages.po b/crossword_puzzle/locales/jw/LC_MESSAGES/messages.po
index 07f2a05bf..97de6dd51 100644
--- a/crossword_puzzle/locales/jw/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/jw/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: jv_ID <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Teka-teki silang"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Ndeleng crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Metu saka app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Setelan Global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Basa"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Ukuran"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "cahya"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "peteng"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Penampilan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "elek"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "miskin"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Rata-rata"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "gedhe"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "sempurno"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kualitas silang"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Mulih"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Muat silang tembung"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Bukak aplikasi web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Mungkasi aplikasi web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferensi count tembung"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pilih jumlah tembung"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "maksimal"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "adat"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Kanggo nindakake operasi iki, sampeyan kudu milih sel dhisik."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Ndeleng"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Nutup"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kangelan"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total tembung"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "kangelan"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pilih"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Baleni meneh"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Apa sampeyan yakin pengin miwiti maneh app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "metu"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Apa sampeyan yakin arep metu saka app? Yen app web lagi mlaku, iku bakal "
 "mungkasi."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Bali menyang omah"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Apa sampeyan yakin arep bali menyang layar ngarep? Aplikasi web bakal "
 "mandheg."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Kesalahan"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Basa iki wis dipilih."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ukuran iki wis dipilih."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Penampilan iki wis dipilih."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kualitas iki wis dipilih."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "bisa diakhiri liwat Activity Monitor ing MacOS, utawa, mung miwiti maneh "
 "komputer kanggo mungkasi."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "tembung dhasar mung diakses nalika versi terjemahan ora ana ing direktori "
 "lokal."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Ana kesalahan ing generasi silang. Mangga deleng informasi luwih lengkap ing"
 " console"
 
-msgid "Easy"
-msgstr "Gampang"
-
-msgid "Medium"
-msgstr "Sedheng"
-
-msgid "Hard"
-msgstr "Hard"
-
-msgid "Extreme"
-msgstr "ekstrem"
-
-msgid "Geography"
-msgstr "Geografi"
-
-msgid "Math"
-msgstr "Matématika"
-
-msgid "Science"
-msgstr "ngelmu"
-
-msgid "Computer Science"
-msgstr "Ilmu Komputer"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Ibukutha"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle Crossword - Game"
 
-#~ msgid "Countries"
-#~ msgstr "negara-negara"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Tengen"
 
-#~ msgid "Easy"
-#~ msgstr "Gampang"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Mudhun"
 
-#~ msgid "Medium"
-#~ msgstr "Sedheng"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Mbukak"
 
-#~ msgid "Hard"
-#~ msgstr "Hard"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sel"
 
-#~ msgid "Extreme"
-#~ msgstr "ekstrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Tembung"
 
-#~ msgid "Geography"
-#~ msgstr "Geografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Science"
-#~ msgstr "Ukuran"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Mrikso"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Kanggo mriksa utawa mbukak sel/tembung, sampeyan kudu milih sel dhisik"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Cetha"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Teka-teki silang - Game"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Skip Smart"
 
-#~ msgid "Across"
-#~ msgstr "nyabrang"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klik kanggo nggedhekake"
 
-#~ msgid "Down"
-#~ msgstr "Mudhun"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Sampeyan ndeleng"
 
-#~ msgid "Reveal"
-#~ msgstr "ngumumke"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "Saka"
 
-#~ msgid "Cell"
-#~ msgstr "sel"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "tembung (s) ora bisa dipasang, nuwun sewu."
 
-#~ msgid "Word"
-#~ msgstr "Tembung"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Count tembung (disesuaikan)"
 
-#~ msgid "Grid"
-#~ msgstr "Grid"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Count count"
 
-#~ msgid "Check"
-#~ msgstr "Mrikso"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Terusake"
 
-#~ msgid "Clear"
-#~ msgstr "Cetha"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Sampeyan ngrampungake crossword!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Skip Smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klik kanggo nggedhekake"
+msgid "Easy"
+msgstr "Gampang"
 
-#~ msgid "You are viewing"
-#~ msgstr "Sampeyan lagi ndeleng"
+msgid "Medium"
+msgstr "Sedheng"
 
-#~ msgid "from"
-#~ msgstr "saka"
+msgid "Hard"
+msgstr "Hard"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "tembung (s) ora bisa dilebokake, nuwun."
+msgid "Extreme"
+msgstr "ekstrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Cacahing tembung (dilaras)"
+msgid "Geography"
+msgstr "Geografi"
 
-#~ msgid "Word count"
-#~ msgstr "Jumlah tembung"
+msgid "Math"
+msgstr "Matématika"
 
-#~ msgid "Continue"
-#~ msgstr "Terus"
+msgid "Science"
+msgstr "ngelmu"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Sampeyan wis rampung silang tembung!"
+msgid "Computer Science"
+msgstr "Ilmu Komputer"
diff --git a/crossword_puzzle/locales/ka/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ka/LC_MESSAGES/messages.mo
index 47f736ecd..73d4f99c5 100644
Binary files a/crossword_puzzle/locales/ka/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ka/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ka/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ka/LC_MESSAGES/messages.po
index 23266065b..fa765b55b 100644
--- a/crossword_puzzle/locales/ka/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ka/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ka <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "კროსვორდის თავსატეხი"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ნახეთ კროსვორდები"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "გადით აპიდან"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "გლობალური პარამეტრები"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ენები"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ზომა"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "მსუბუქი"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ბნელი"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "სისტემა"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "გარეგნობა"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "საშინელი"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ღარიბი"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "საშუალო"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "დიდი"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "სრულყოფილი"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "კროსვორდის ხარისხი"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "კროსვორდის ბრაუზერი"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Დაბრუნდი"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "კროსვორდის ჩატვირთვა"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "გახსენით ვებ აპლიკაცია"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ვებ აპის შეწყვეტა"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "სიტყვების რაოდენობის პარამეტრები"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "აირჩიეთ სიტყვების რაოდენობა"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "მაქსიმალური"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "საბაჟო"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ამ ოპერაციის შესასრულებლად, ჯერ უნდა აირჩიოთ უჯრედი."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ხედი"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "დახურვა"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "სირთულე"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "სულ სიტყვები"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "სირთულე"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "აირჩიეთ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Რესტარტი"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "დარწმუნებული ხართ, რომ გსურთ აპის გადატვირთვა?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "გასვლა"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "დარწმუნებული ხართ, რომ გსურთ აპიდან გასვლა? თუ ვებ აპი გაშვებულია, ის "
 "შეწყდება."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "სახლში დაბრუნება"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "დარწმუნებული ხართ, რომ გსურთ საწყის ეკრანზე დაბრუნება? ვებ აპი შეწყდება."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "შეცდომა"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ეს ენა უკვე შერჩეულია."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ეს ზომა უკვე შერჩეულია."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ეს გარეგნობა უკვე შერჩეულია."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ეს ხარისხი უკვე შეირჩევა."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ინფორმაცია"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "Activity Monitor-ის მეშვეობით MacOS-ზე, ან უბრალოდ გადატვირთეთ კომპიუტერი "
 "მათი შესაწყვეტად."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "საბაზისო კროსვორდის მონაცემებზე წვდომა შესაძლებელია მხოლოდ მაშინ, როდესაც "
 "მისი ნათარგმნი ვერსია არ არის ლოკალების დირექტორიაში."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,118 +237,104 @@ msgstr ""
 "კროსვორდის გენერირებაში მოხდა შეცდომა. გთხოვთ, იხილოთ დამატებითი ინფორმაცია "
 "კონსოლში"
 
-msgid "Easy"
-msgstr "Ადვილი"
-
-msgid "Medium"
-msgstr "საშუალო"
-
-msgid "Hard"
-msgstr "მძიმე"
-
-msgid "Extreme"
-msgstr "ექსტრემალური"
-
-msgid "Geography"
-msgstr "გეოგრაფია"
-
-msgid "Math"
-msgstr "Მათემატიკა"
-
-msgid "Science"
-msgstr "მეცნიერება"
-
-msgid "Computer Science"
-msgstr "Კომპიუტერული მეცნიერება"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "დედაქალაქები"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - თამაში"
 
-#~ msgid "Countries"
-#~ msgstr "ქვეყნები"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "გაღმა"
 
-#~ msgid "Easy"
-#~ msgstr "Ადვილი"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ძირს"
 
-#~ msgid "Medium"
-#~ msgstr "საშუალო"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "აღმოჩენა"
 
-#~ msgid "Hard"
-#~ msgstr "მძიმე"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "უჯრედი"
 
-#~ msgid "Extreme"
-#~ msgstr "ექსტრემალური"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "სიტყვა"
 
-#~ msgid "Geography"
-#~ msgstr "გეოგრაფია"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ბადე"
 
-#~ msgid "Science"
-#~ msgstr "ზომა"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Ჩეკი"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "უჯრედის/სიტყვის შესამოწმებლად ან გამოსავლენად, ჯერ უნდა აირჩიოთ უჯრედი"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "გასუფთავება"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "კროსვორდის თავსატეხი - თამაში"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ჭკვიანი გამოტოვება"
 
-#~ msgid "Across"
-#~ msgstr "გადაღმა"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "დააჭირეთ მასშტაბის მასშტაბს"
 
-#~ msgid "Down"
-#~ msgstr "ქვემოთ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "თქვენ ათვალიერებთ"
 
-#~ msgid "Reveal"
-#~ msgstr "გამოავლინე"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "-გან"
 
-#~ msgid "Cell"
-#~ msgstr "უჯრედი"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "სიტყვის (ებ) ის ჩასმა შეუძლებელია, უკაცრავად."
 
-#~ msgid "Word"
-#~ msgstr "სიტყვა"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "სიტყვების დათვლა (მორგებული)"
 
-#~ msgid "Grid"
-#~ msgstr "ბადე"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "სიტყვების დათვლა"
 
-#~ msgid "Check"
-#~ msgstr "Ჩეკი"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "გაგრძელება"
 
-#~ msgid "Clear"
-#~ msgstr "წმინდა"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "თქვენ დაასრულეთ ჯვარედინი სიტყვა!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "ჭკვიანი გამოტოვება"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "დააჭირეთ მასშტაბის მასშტაბს"
+msgid "Easy"
+msgstr "Ადვილი"
 
-#~ msgid "You are viewing"
-#~ msgstr "თქვენ ათვალიერებთ"
+msgid "Medium"
+msgstr "საშუალო"
 
-#~ msgid "from"
-#~ msgstr "საწყისი"
+msgid "Hard"
+msgstr "მძიმე"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "სიტყვა(ებ)ის ჩასმა ვერ მოხერხდა, უკაცრავად."
+msgid "Extreme"
+msgstr "ექსტრემალური"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "სიტყვების რაოდენობა (მორგებული)"
+msgid "Geography"
+msgstr "გეოგრაფია"
 
-#~ msgid "Word count"
-#~ msgstr "სიტყვების რაოდენობა"
+msgid "Math"
+msgstr "Მათემატიკა"
 
-#~ msgid "Continue"
-#~ msgstr "განაგრძეთ"
+msgid "Science"
+msgstr "მეცნიერება"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "თქვენ დაასრულეთ კროსვორდი!"
+msgid "Computer Science"
+msgstr "Კომპიუტერული მეცნიერება"
diff --git a/crossword_puzzle/locales/kk/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/kk/LC_MESSAGES/messages.mo
index 24f803c4e..13656743c 100644
Binary files a/crossword_puzzle/locales/kk/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/kk/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/kk/LC_MESSAGES/messages.po b/crossword_puzzle/locales/kk/LC_MESSAGES/messages.po
index 9de0ca2a9..75adf2f5a 100644
--- a/crossword_puzzle/locales/kk/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/kk/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: kk <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Сөзжұмбақ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Кроссвордтарды қарау"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Қолданбадан шығыңыз"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Ғаламдық параметрлер"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Тілдер"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Өлшем"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "жарық"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "қараңғы"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "жүйесі"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Сыртқы түрі"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "қорқынышты"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "жарлы"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "орта шама"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ұлы"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "жетілдіру"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Кроссворд сапасы"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Кроссворд браузері"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Қайтып келу"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Кроссворд жүктеңіз"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Веб қолданбасын ашыңыз"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Веб қолданбаны тоқтату"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Сөздерді санау теңшелімдері"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Сөз санын таңдаңыз"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максималды"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Арнаулы"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Бұл әрекетті орындау үшін алдымен ұяшықты таңдау керек."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Көру"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Жабық"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "қиындық"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Жалпы сөздер"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Қиындық"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "таңдаңыз"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Қайтадан қосу"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Қолданбаны қайта іске қосқыңыз келетініне сенімдісіз бе?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Шығу"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Қолданбадан шынымен шыққыңыз келе ме? Егер веб-бағдарлама жұмыс істеп тұрса,"
 " ол тоқтатылады."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Үйге оралу"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Негізгі экранға оралғыңыз келетініне сенімдісіз бе? Веб қолданба "
 "тоқтатылады."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Қате"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Бұл тіл әлдеқашан таңдалған."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Бұл өлшем әлдеқашан таңдалған."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Бұл көрініс әлдеқашан таңдалған."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Бұл сапа таңдалған."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Ақпарат"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "процестерін MacOS жүйесіндегі Activity Monitor арқылы тоқтатуға болады "
 "немесе оларды тоқтату үшін компьютерді қайта іске қосыңыз."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,124 +230,111 @@ msgstr ""
 " Негізгі кроссворд деректеріне оның аударылған нұсқасы тілдер каталогында "
 "болмаған кезде ғана қол жеткізуге болады."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "Кроссворд жасау кезінде қате орын алды. Қосымша ақпаратты консольден қараңыз"
 
-msgid "Easy"
-msgstr "Жеңіл"
-
-msgid "Medium"
-msgstr "Орташа"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Кроссворд жұмбақ - ойын"
 
-msgid "Hard"
-msgstr "Қатты"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Арқылы"
 
-msgid "Extreme"
-msgstr "Төтенше"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Төмен"
 
-msgid "Geography"
-msgstr "География"
-
-msgid "Math"
-msgstr "Математика"
-
-msgid "Science"
-msgstr "Ғылым"
-
-msgid "Computer Science"
-msgstr "Есептеу техникасы"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ашу"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Камера"
 
-#~ msgid "Capitals"
-#~ msgstr "Бас әріптер"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Сөз"
 
-#~ msgid "Countries"
-#~ msgstr "Елдер"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Тор"
 
-#~ msgid "Easy"
-#~ msgstr "Жеңіл"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Қарау"
 
-#~ msgid "Medium"
-#~ msgstr "Орташа"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Айқын"
 
-#~ msgid "Hard"
-#~ msgstr "Қатты"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "SMART SKIP"
 
-#~ msgid "Extreme"
-#~ msgstr "Төтенше"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Ұлту үшін нұқыңыз"
 
-#~ msgid "Geography"
-#~ msgstr "География"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Сіз көріп отырсыз"
 
-#~ msgid "Science"
-#~ msgstr "Өлшем"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "-ден"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Ұяшықты/сөзді тексеру немесе ашу үшін алдымен ұяшықты таңдау керек"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Word (лер) салынбады, кешіріңіз."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Сөзжұмбақ – ойын"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Сөзді санау (реттелген)"
 
-#~ msgid "Across"
-#~ msgstr "қарсы"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Сөз саны"
 
-#~ msgid "Down"
-#~ msgstr "Төмен"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Жалғастыру"
 
-#~ msgid "Reveal"
-#~ msgstr "Ашу"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Сіз кроссвордты аяқтадыңыз!"
 
-#~ msgid "Cell"
-#~ msgstr "Ұяшық"
-
-#~ msgid "Word"
-#~ msgstr "Сөз"
-
-#~ msgid "Grid"
-#~ msgstr "Тор"
-
-#~ msgid "Check"
-#~ msgstr "Тексеру"
-
-#~ msgid "Clear"
-#~ msgstr "Таза"
-
-#~ msgid "Smart Skip"
-#~ msgstr "SMART SKIP"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Ұлту үшін нұқыңыз"
+msgid "Easy"
+msgstr "Жеңіл"
 
-#~ msgid "You are viewing"
-#~ msgstr "Сіз қарап отырсыз"
+msgid "Medium"
+msgstr "Орташа"
 
-#~ msgid "from"
-#~ msgstr "бастап"
+msgid "Hard"
+msgstr "Қатты"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "сөз(дер) енгізілмеді, кешіріңіз."
+msgid "Extreme"
+msgstr "Төтенше"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Сөздер саны (түзетілген)"
+msgid "Geography"
+msgstr "География"
 
-#~ msgid "Word count"
-#~ msgstr "Сөз саны"
+msgid "Math"
+msgstr "Математика"
 
-#~ msgid "Continue"
-#~ msgstr "Жалғастыру"
+msgid "Science"
+msgstr "Ғылым"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Сіз кроссвордты аяқтадыңыз!"
+msgid "Computer Science"
+msgstr "Есептеу техникасы"
diff --git a/crossword_puzzle/locales/km/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/km/LC_MESSAGES/messages.mo
index 0dfd53de2..0666a5a98 100644
Binary files a/crossword_puzzle/locales/km/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/km/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/km/LC_MESSAGES/messages.po b/crossword_puzzle/locales/km/LC_MESSAGES/messages.po
index b2f972c04..dd671c5bb 100644
--- a/crossword_puzzle/locales/km/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/km/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: km <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ល្បែងផ្គុំពាក្យឆ្លង"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "មើលពាក្យឆ្លង"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ចេញពីកម្មវិធី"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ការកំណត់សកល"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ភាសា"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ទំហំ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ពន្លឺ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ងងឹត"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ប្រព័ន្ធ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "រូបរាង"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "អារកក់កយរអាេយខ្លាច"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "រកីរក"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "មធ្យម"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ដ៏ធម"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "សុរកិត"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "គុណភាពឆ្លងដែន"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "កម្មវិធីរុករកតាមអ៊ីនធឺណិត"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ត្រឡប់​ក្រោយ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ផ្ទុកពាក្យឆ្លង"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "បើកកម្មវិធីបណ្តាញ"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "បញ្ចប់កម្មវិធីបណ្តាញ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "ចំណូលចិត្តរាប់ពាក្យ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "ជ្រើសរើសចំនួនពាក្យ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "អតិបរមា"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ដើម្បីអនុវត្តប្រតិបត្តិការនេះដំបូងអ្នកត្រូវតែជ្រើសក្រឡា។"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "មើល"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "បិទ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ការលំបាក"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ពាក្យសរុប"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ភាពលំបាក"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ជ្រើសរើស"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "ចាប់ផ្ដើមឡើងវិញ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "តើអ្នកប្រាកដថាចង់ចាប់ផ្តើមកម្មវិធីឡើងវិញទេ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ចេញ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "តើអ្នកប្រាកដថាចង់ចាកចេញពីកម្មវិធីមែនទេ? ប្រសិនបើកម្មវិធីបណ្តាញកំពុងដំណើរការ "
 "វានឹងត្រូវបានបញ្ចប់។"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ត្រលប់​ទៅផ្ទះ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "តើអ្នកប្រាកដថាចង់ត្រលប់ទៅអេក្រង់ដើមវិញទេ? កម្មវិធីបណ្តាញនឹងត្រូវបានបិទ។"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "កំហុស"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ភាសានេះត្រូវបានជ្រើសរើសរួចហើយ។"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ទំហំនេះត្រូវបានជ្រើសរើសរួចហើយ។"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "រូបរាងនេះត្រូវបានជ្រើសរើសរួចហើយ។"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "គុណភាពនេះត្រូវបានជ្រើសរើសរួចហើយ។"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ព័ត៌មាន"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 " Activity Monitor នៅលើ MacOS "
 "ឬគ្រាន់តែចាប់ផ្តើមកុំព្យូទ័ររបស់អ្នកឡើងវិញដើម្បីបិទវា។"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "ត្រូវប្រាកដថានិយមន័យរបស់វា ឯកសារ JSON មាននៅក្នុងថត cwords មូលដ្ឋាន។ ចំណាំ៖ "
 "ទិន្នន័យ​ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ត្រូវ​បាន​ចូល​ប្រើ​តែ​នៅ​ពេល​ដែល​កំណែ​ប្រែ​របស់​វា​មិន​មាន​នៅ​ក្នុង​ថត​មូលដ្ឋាន។"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,117 +237,104 @@ msgstr ""
 "កំហុសមួយបានកើតឡើងនៅក្នុងការបង្កើតពាក្យឆ្លង។ "
 "សូមមើលព័ត៌មានបន្ថែមនៅក្នុងកុងសូល។"
 
-msgid "Easy"
-msgstr "ងាយស្រួល"
-
-msgid "Medium"
-msgstr "មធ្យម"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ល្បែងផ្គុំរូបឈើឆ្កាង - ល្បែង"
 
-msgid "Hard"
-msgstr "រឹង"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ឆ្លងកាត់"
 
-msgid "Extreme"
-msgstr "ខ្លាំង"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ឆ្ពោហតោខាងរេកាម"
 
-msgid "Geography"
-msgstr "ភូមិសាស្ត្រ"
-
-msgid "Math"
-msgstr "គណិតវិទ្យា"
-
-msgid "Science"
-msgstr "វិទ្យាសាស្ត្រ"
-
-msgid "Computer Science"
-msgstr "វិទ្យាសាស្ត្រ​កុំព្យូទ័រ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "បហ្ចេញអាេយដឹង"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "បន្ទប់ក្នុងកុក"
 
-#~ msgid "Capitals"
-#~ msgstr "រាជធានី"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "ហក្យ"
 
-#~ msgid "Countries"
-#~ msgstr "ប្រទេស"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "បប្យេសី"
 
-#~ msgid "Easy"
-#~ msgstr "ងាយស្រួល"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ការបិនិត្យ"
 
-#~ msgid "Medium"
-#~ msgstr "មធ្យម"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ផ្លឺ"
 
-#~ msgid "Hard"
-#~ msgstr "រឹង"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "ខ្លាំង"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ចុចដើម្បីពង្រីក"
 
-#~ msgid "Geography"
-#~ msgstr "ភូមិសាស្ត្រ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "អ្នកកំពុងមើល"
 
-#~ msgid "Science"
-#~ msgstr "ទំហំ"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "តាមងបី"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "ដើម្បីពិនិត្យ ឬបង្ហាញក្រឡា/ពាក្យ អ្នកត្រូវតែជ្រើសរើសក្រឡាជាមុនសិន"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "សូមទោសពាក្យមិនអាចត្រូវបានបញ្ចូលសូមទោស។"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ល្បែងផ្គុំរូប Crossword - ហ្គេម"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "ចំនួនពាក្យ (បានលៃតម្រូវ)"
 
-#~ msgid "Across"
-#~ msgstr "ឆ្លង"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "រាប់​ពាក្យ"
 
-#~ msgid "Down"
-#~ msgstr "ចុះ"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "បន្ដ"
 
-#~ msgid "Reveal"
-#~ msgstr "បង្ហាញ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "អ្នកបានបញ្ចប់ការឆ្លង Crossword!"
 
-#~ msgid "Cell"
-#~ msgstr "ក្រឡា"
-
-#~ msgid "Word"
-#~ msgstr "ពាក្យ"
-
-#~ msgid "Grid"
-#~ msgstr "ក្រឡាចត្រង្គ"
-
-#~ msgid "Check"
-#~ msgstr "ពិនិត្យ"
-
-#~ msgid "Clear"
-#~ msgstr "ច្បាស់"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ចុចដើម្បីពង្រីក"
+msgid "Easy"
+msgstr "ងាយស្រួល"
 
-#~ msgid "You are viewing"
-#~ msgstr "អ្នកកំពុងមើល"
+msgid "Medium"
+msgstr "មធ្យម"
 
-#~ msgid "from"
-#~ msgstr "ពី"
+msgid "Hard"
+msgstr "រឹង"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "មិនអាចបញ្ចូលពាក្យបានទេ សូមអភ័យទោស។"
+msgid "Extreme"
+msgstr "ខ្លាំង"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "ចំនួន​ពាក្យ (កែសម្រួល)"
+msgid "Geography"
+msgstr "ភូមិសាស្ត្រ"
 
-#~ msgid "Word count"
-#~ msgstr "រាប់​ពាក្យ"
+msgid "Math"
+msgstr "គណិតវិទ្យា"
 
-#~ msgid "Continue"
-#~ msgstr "បន្ត"
+msgid "Science"
+msgstr "វិទ្យាសាស្ត្រ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "អ្នកបានបញ្ចប់ crossword!"
+msgid "Computer Science"
+msgstr "វិទ្យាសាស្ត្រ​កុំព្យូទ័រ"
diff --git a/crossword_puzzle/locales/kn/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/kn/LC_MESSAGES/messages.mo
index 324e52f32..bb3c381b6 100644
Binary files a/crossword_puzzle/locales/kn/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/kn/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/kn/LC_MESSAGES/messages.po b/crossword_puzzle/locales/kn/LC_MESSAGES/messages.po
index f929216ee..657d1da2d 100644
--- a/crossword_puzzle/locales/kn/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/kn/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: kn <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ಪದಬಂಧ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ಕ್ರಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ವೀಕ್ಷಿಸಿ"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ಅಪ್ಲಿಕೇಶನ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿ"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ಭಾಷೆಗಳು"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ಗಾತ್ರ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ಬೆಳಕು"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ಕತ್ತಲು"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ವ್ಯವಸ್ಥೆ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "ಗೋಚರತೆ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ಭಯಾನಕ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ಬಡ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ಸರಾಸರಿ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ಶ್ರೇಷ್ಠ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ಪರಿಪೂರ್ಣ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ಕ್ರಾಸ್‌ವರ್ಡ್ ಗುಣಮಟ್ಟ"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "ಕ್ರಾಸ್ವರ್ಡ್ ಬ್ರೌಸರ್"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ಹಿಂದೆ ಹೋಗು"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ಕ್ರಾಸ್ವರ್ಡ್ ಅನ್ನು ಲೋಡ್ ಮಾಡಿ"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ವೆಬ್ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಿರಿ"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ವೆಬ್ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಕೊನೆಗೊಳಿಸಿ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "ಪದಗಳ ಎಣಿಕೆ ಆದ್ಯತೆಗಳು"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "ಪದಗಳ ಸಂಖ್ಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "ಗರಿಷ್ಠ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "ಕಸ್ಟಮ್"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ಈ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಮಾಡಲು, ನೀವು ಮೊದಲು ಕೋಶವನ್ನು ಆಯ್ಕೆ ಮಾಡಬೇಕು."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ನೋಟ"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ಮುಚ್ಚಿ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ಕಷ್ಟ"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ಒಟ್ಟು ಪದಗಳು"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ಕಷ್ಟ"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ಆಯ್ಕೆ ಮಾಡಿ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "ಪುನರಾರಂಭದ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "ನೀವು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ನಿರ್ಗಮಿಸಿ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ನಿಂದ ನಿರ್ಗಮಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ವೆಬ್ ಅಪ್ಲಿಕೇಶನ್ "
 "ಚಾಲನೆಯಲ್ಲಿದ್ದರೆ, ಅದನ್ನು ಕೊನೆಗೊಳಿಸಲಾಗುತ್ತದೆ."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ಮರಳಿ ಮನೆಗೆ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "ನೀವು ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ಗೆ ಹಿಂತಿರುಗಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ವೆಬ್ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು "
 "ಕೊನೆಗೊಳಿಸಲಾಗುತ್ತದೆ."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ದೋಷ"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ಈ ಭಾಷೆಯನ್ನು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ಈ ಗಾತ್ರವನ್ನು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ಈ ನೋಟವನ್ನು ಈಗಾಗಲೇ ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ಈ ಗುಣವನ್ನು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ಮಾಹಿತಿ"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "ನಲ್ಲಿ ಚಟುವಟಿಕೆ ಮಾನಿಟರ್ ಮೂಲಕ ಕೊನೆಗೊಳಿಸಬಹುದು ಅಥವಾ ಅವುಗಳನ್ನು ಕೊನೆಗೊಳಿಸಲು ನಿಮ್ಮ "
 "ಕಂಪ್ಯೂಟರ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಸೂಚನೆ: ಲೊಕೇಲ್ಸ್ ಡೈರೆಕ್ಟರಿಯಲ್ಲಿ ಅದರ ಅನುವಾದಿತ ಆವೃತ್ತಿ "
 "ಇಲ್ಲದಿದ್ದಾಗ ಮಾತ್ರ ಮೂಲ ಕ್ರಾಸ್‌ವರ್ಡ್ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲಾಗುತ್ತದೆ."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "ಕ್ರಾಸ್‌ವರ್ಡ್ ಉತ್ಪಾದನೆಯಲ್ಲಿ ದೋಷ ಸಂಭವಿಸಿದೆ. ದಯವಿಟ್ಟು ಕನ್ಸೋಲ್‌ನಲ್ಲಿ ಹೆಚ್ಚಿನ "
 "ಮಾಹಿತಿಯನ್ನು ನೋಡಿ"
 
-msgid "Easy"
-msgstr "ಸುಲಭ"
-
-msgid "Medium"
-msgstr "ಮಾಧ್ಯಮ"
-
-msgid "Hard"
-msgstr "ಕಠಿಣ"
-
-msgid "Extreme"
-msgstr "ವಿಪರೀತ"
-
-msgid "Geography"
-msgstr "ಭೂಗೋಳಶಾಸ್ತ್ರ"
-
-msgid "Math"
-msgstr "ಗಣಿತ"
-
-msgid "Science"
-msgstr "ವಿಜ್ಞಾನ"
-
-msgid "Computer Science"
-msgstr "ಗಣಕ ಯಂತ್ರ ವಿಜ್ಞಾನ"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "ರಾಜಧಾನಿಗಳು"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ಕ್ರಾಸ್‌ವರ್ಡ್ ಒಗಟು - ಆಟ"
 
-#~ msgid "Countries"
-#~ msgstr "ದೇಶಗಳು"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ಅಡ್ಡಲಾಗಿ"
 
-#~ msgid "Easy"
-#~ msgstr "ಸುಲಭ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ಕೆಳಗೆ"
 
-#~ msgid "Medium"
-#~ msgstr "ಮಾಧ್ಯಮ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "ಬಹಿರಂಗ"
 
-#~ msgid "Hard"
-#~ msgstr "ಕಠಿಣ"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ಕೋಶ"
 
-#~ msgid "Extreme"
-#~ msgstr "ವಿಪರೀತ"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "ಮಾತು"
 
-#~ msgid "Geography"
-#~ msgstr "ಭೂಗೋಳಶಾಸ್ತ್ರ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ಗ್ರಿಡ್"
 
-#~ msgid "Science"
-#~ msgstr "ಗಾತ್ರ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ಪರಿಶೀಲನೆ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "ಕೋಶ/ಪದವನ್ನು ಪರಿಶೀಲಿಸಲು ಅಥವಾ ಬಹಿರಂಗಪಡಿಸಲು, ನೀವು ಮೊದಲು ಸೆಲ್ ಅನ್ನು ಆಯ್ಕೆ "
-#~ "ಮಾಡಬೇಕು"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ಸ್ಪಷ್ಟ"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ಕ್ರಾಸ್ವರ್ಡ್ ಪಜಲ್ - ಆಟ"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ಸ್ಮಾರ್ಟ್ ಸ್ಕಿಪ್"
 
-#~ msgid "Across"
-#~ msgstr "ಅಡ್ಡಲಾಗಿ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ಜೂಮ್ ಮಾಡಲು ಕ್ಲಿಕ್ ಮಾಡಿ"
 
-#~ msgid "Down"
-#~ msgstr "ಕೆಳಗೆ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "ನೀವು ವೀಕ್ಷಿಸುತ್ತಿದ್ದೀರಿ"
 
-#~ msgid "Reveal"
-#~ msgstr "ಬಹಿರಂಗಪಡಿಸಿ"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ನಿಂದ"
 
-#~ msgid "Cell"
-#~ msgstr "ಕೋಶ"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ಪದ (ಗಳನ್ನು) ಸೇರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ, ಕ್ಷಮಿಸಿ."
 
-#~ msgid "Word"
-#~ msgstr "ಪದ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "ಪದ ಎಣಿಕೆ (ಹೊಂದಿಸಲಾಗಿದೆ)"
 
-#~ msgid "Grid"
-#~ msgstr "ಗ್ರಿಡ್"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "ಮಾತು"
 
-#~ msgid "Check"
-#~ msgstr "ಪರಿಶೀಲಿಸಿ"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ಮುಂದುವರಿಸು"
 
-#~ msgid "Clear"
-#~ msgstr "ಸ್ಪಷ್ಟ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "ನೀವು ಕ್ರಾಸ್‌ವರ್ಡ್ ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "ಚಾಚು"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ಜೂಮ್ ಮಾಡಲು ಕ್ಲಿಕ್ ಮಾಡಿ"
+msgid "Easy"
+msgstr "ಸುಲಭ"
 
-#~ msgid "You are viewing"
-#~ msgstr "ನೀವು ವೀಕ್ಷಿಸುತ್ತಿರುವಿರಿ"
+msgid "Medium"
+msgstr "ಮಾಧ್ಯಮ"
 
-#~ msgid "from"
-#~ msgstr "ನಿಂದ"
+msgid "Hard"
+msgstr "ಕಠಿಣ"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ಪದ(ಗಳನ್ನು) ಸೇರಿಸಲಾಗಲಿಲ್ಲ, ಕ್ಷಮಿಸಿ."
+msgid "Extreme"
+msgstr "ವಿಪರೀತ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "ಪದಗಳ ಎಣಿಕೆ (ಹೊಂದಾಣಿಕೆ)"
+msgid "Geography"
+msgstr "ಭೂಗೋಳಶಾಸ್ತ್ರ"
 
-#~ msgid "Word count"
-#~ msgstr "ಪದಗಳ ಎಣಿಕೆ"
+msgid "Math"
+msgstr "ಗಣಿತ"
 
-#~ msgid "Continue"
-#~ msgstr "ಮುಂದುವರಿಸಿ"
+msgid "Science"
+msgstr "ವಿಜ್ಞಾನ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "ನೀವು ಕ್ರಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಪೂರ್ಣಗೊಳಿಸಿದ್ದೀರಿ!"
+msgid "Computer Science"
+msgstr "ಗಣಕ ಯಂತ್ರ ವಿಜ್ಞಾನ"
diff --git a/crossword_puzzle/locales/ko/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ko/LC_MESSAGES/messages.mo
index e9adcd0ff..871822a82 100644
Binary files a/crossword_puzzle/locales/ko/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ko/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ko/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ko/LC_MESSAGES/messages.po
index 4a13dec39..ef64256ac 100644
--- a/crossword_puzzle/locales/ko/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ko/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ko <LL@li.org>\n"
@@ -19,188 +19,204 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: src/main.py:43 src/main.py:80 src/main.py:144 src/main.py:212
 msgid "Crossword Puzzle"
 msgstr "크로스워드 퍼즐"
 
-#: main.py:145
+#: src/main.py:88
 msgid "View crosswords"
 msgstr "크로스워드 보기"
 
-#: main.py:154
+#: src/main.py:92
 msgid "Exit the app"
 msgstr "앱 종료"
 
-#: main.py:165
+#: src/main.py:98
 msgid "Global Settings"
 msgstr "전역 설정"
 
-#: main.py:172
+#: src/main.py:102
 msgid "Languages"
 msgstr "언어"
 
-#: main.py:184
+#: src/main.py:108
 msgid "Size"
 msgstr "크기"
 
-#: main.py:203
+#: src/main.py:115
 msgid "light"
 msgstr "밝은"
+#: It was translated to 빛 which means the light (comming from sun or LED, lemp and so on)
 
-#: main.py:203
+#: src/main.py:115
 msgid "dark"
 msgstr "어두운"
 
-#: main.py:203
+#: src/main.py:115
 msgid "system"
-msgstr "시스템"
+msgstr "시스템" 
+#: 체계 means system but it's very odd to use in this case
 
-#: main.py:206 main.py:220
+#: src/main.py:116
 msgid "Appearance"
-msgstr "환경"
+msgstr "환경" 
+#: better to use 환경
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "끔찍한"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "가난한"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "평균"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "엄청난"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "완벽한"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "크로스 워드 품질"
 
-#: main.py:262 main.py:415
+#: src/main.py:138 src/main.py:267
 msgid "Crossword Browser"
 msgstr "크로스워드 브라우저"
 
-#: main.py:420
+#: src/main.py:269
 msgid "Go back"
 msgstr "돌아가기"
 
-#: main.py:431
+#: src/main.py:274
 msgid "Load crossword"
 msgstr "크로스워드 불러오기"
+#: 불러오기 is more often used tnan 로드
 
-#: main.py:440
+#: src/main.py:278
 msgid "Open web app"
 msgstr "웹앱 열기"
+#: you don't need space in between web and app
 
-#: main.py:449
+#: src/main.py:282
 msgid "Terminate web app"
 msgstr "웹앱 종료"
 
-#: main.py:460
+#: src/main.py:288
 msgid "Word count preferences"
 msgstr "단어 수 설정"
+#: you don't need the word 환경(whuch means environment) in this case
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: src/main.py:295 src/main.py:337 src/main.py:372 src/main.py:527
 msgid "Select word count"
 msgstr "단어 수 선택"
 
-#: main.py:478 main.py:581 main.py:820
+#: src/main.py:297 src/main.py:371 src/main.py:542
 msgid "Maximum"
 msgstr "최대"
+#: 최고 sounds more like best
 
-#: main.py:489
+#: src/main.py:303
 msgid "Custom"
 msgstr "커스텀"
+#: 관습 means tradition
 
-#: main.py:694
+#: src/main.py:462
 msgid "To perform this operation, you must first select a cell."
 msgstr "이 작업을 수행하려면 먼저 칸을 선택해야합니다."
+#: it is better to use 칸(cell) than using 셀(cell)
 
-#: main.py:886
+#: src/main.py:589
 msgid "View"
 msgstr "보기"
+#: verb form sounds bad in this case
 
-#: main.py:893
+#: src/cword_webapp/templates/index.html:230 src/main.py:591
 msgid "Close"
 msgstr "닫기"
+#: same as privious
 
-#: main.py:1042 main.py:1086
+#: src/main.py:681 src/main.py:705
 msgid "difficulty"
 msgstr "난이도"
+#: 어려움 means hard or hardness
 
-#: main.py:1078
+#: src/main.py:702
 msgid "Total words"
 msgstr "총 단어수"
 
-#: main.py:1085
+#: src/main.py:705
 msgid "Difficulty"
 msgstr "난이도"
+#: difficulty not hard
 
-#: main.py:1098
+#: src/main.py:710
 msgid "Select"
 msgstr "선택하기"
+#: verbs sounds bad
 
-#: main.py:1150
+#: src/main.py:745
 msgid "Restart"
 msgstr "재시작"
 
-#: main.py:1150
+#: src/main.py:745
 msgid "Are you sure you want to restart the app?"
 msgstr "앱을 다시 시작하시겠습니까?"
 
-#: main.py:1156
+#: src/main.py:749
 msgid "Exit"
 msgstr "나가기"
+#: 출구 is exit but usually means "exit door/gate/path"
 
-#: main.py:1157
+#: src/main.py:750
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr "앱을 종료하시겠습니까? 웹앱이 실행 중이면 종료됩니다."
 
-#: main.py:1166
+#: src/main.py:755
 msgid "Back to home"
 msgstr "홈으로"
 
-#: main.py:1167
+#: src/main.py:756
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "홈 화면으로 돌아가시겠습니까? 웹앱이 종료됩니다."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: src/main.py:772 src/main.py:775 src/main.py:778 src/main.py:791
+#: src/main.py:797
 msgid "Error"
 msgstr "오류"
 
-#: main.py:1190
+#: src/main.py:772
 msgid "This language is already selected."
 msgstr "이 언어는 이미 선택되어 있습니다."
 
-#: main.py:1195
+#: src/main.py:775
 msgid "This size is already selected."
 msgstr "이 크기는 이미 선택되었습니다."
 
-#: main.py:1200
+#: src/main.py:778
 msgid "This appearance is already selected."
 msgstr "이 환경은 이미 선택되어 있습니다."
+#: it is better to use 모양세 or 디자인(design) 환경(environment), I guess 환경 is the best option here 
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "이 품질은 이미 선택되었습니다."
 
-#: main.py:1210
+#: src/main.py:781
 msgid "Info"
 msgstr "정보"
 
-#: main.py:1211
+#: src/main.py:782
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -217,8 +233,9 @@ msgstr ""
 "않습니다. 실수로 이 작업을 수행하면 프로그램이 다른 포트를 사용하여 새 웹앱을 실행합니다. 또는 프로그램의 구성 파일에서 포트를 "
 "수동으로 변경할 수 있습니다. 제대로 종료되지 않은 모든 앱 프로세스는 MacOS의 Activity Monitor를 통해 종료하거나 "
 "컴퓨터를 다시 시작하여 종료할 수 있습니다."
+#: 웹 앱 to 웹앱
 
-#: main.py:1229
+#: src/main.py:792
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -227,13 +244,102 @@ msgid ""
 msgstr ""
 "이 크로스워드의 설명을 로드하는 동안 오류가 발생했습니다. 해당 정의 JSON 파일이 기본 cwords 디렉터리에 있는지 확인하세요. "
 "참고: 기본 크로스워드 데이터는 번역된 버전이 로케일 디렉토리에 없을 때만 액세스됩니다."
+#: 설명 is better to use in this case
 
-#: main.py:1241
+#: src/main.py:798
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "크로스워드 생성 중 오류가 발생했습니다. 자세한 내용은 콘솔에서 확인하세요."
 
+#: src/cword_webapp/templates/index.html:13
+#: src/cword_webapp/templates/index.html:216
+msgid "Crossword Puzzle - Game"
+msgstr "크로스워드 퍼즐 - 게임"
+
+#: src/cword_webapp/templates/index.html:133
+msgid "Across"
+msgstr "가로"
+#: if you ment Across to the Horizontal direction it is "가로"
+
+#: src/cword_webapp/templates/index.html:154
+msgid "Down"
+msgstr "세로"
+#: if you ment vertical, it is "세로"
+
+#: src/cword_webapp/templates/index.html:177
+msgid "Reveal"
+msgstr "드러내기"
+#: What the...?
+
+#: src/cword_webapp/templates/index.html:179
+#: src/cword_webapp/templates/index.html:186
+msgid "Cell"
+msgstr "칸"
+#: 칸 sounds better
+
+#: src/cword_webapp/templates/index.html:180
+#: src/cword_webapp/templates/index.html:187
+#: src/cword_webapp/templates/index.html:193
+msgid "Word"
+msgstr "단어"
+
+#: src/cword_webapp/templates/index.html:181
+#: src/cword_webapp/templates/index.html:188
+#: src/cword_webapp/templates/index.html:194
+msgid "Grid"
+msgstr "그리드"
+
+#: src/cword_webapp/templates/index.html:184
+msgid "Check"
+msgstr "확인하다"
+
+#: src/cword_webapp/templates/index.html:191
+msgid "Clear"
+msgstr "클리어"
+#: it's better to use 클리어
+
+#: src/cword_webapp/templates/index.html:202
+msgid "Smart Skip"
+msgstr "스마트 스킵"
+#: 스킵 is better
+
+#: src/cword_webapp/templates/index.html:208
+msgid "Click To Zoom"
+msgstr "확대하려면 클릭하세요"
+
+#: src/cword_webapp/templates/index.html:217
+msgid "You are viewing"
+msgstr "이미 보고있습니다"
+#: that was rude
+
+#: src/cword_webapp/templates/index.html:217
+msgid "from"
+msgstr "~에서"
+
+#: src/cword_webapp/templates/index.html:219
+msgid "word(s) could not be inserted, sorry."
+msgstr "죄송합니다. 단어를 입력할 수 없습니다."
+#: it's better to use 입력
+
+#: src/cword_webapp/templates/index.html:220
+msgid "Word count (adjusted)"
+msgstr "단어 수(조정됨)"
+
+#: src/cword_webapp/templates/index.html:222
+msgid "Word count"
+msgstr "단어 수"
+
+#: src/cword_webapp/templates/index.html:224
+msgid "Continue"
+msgstr "계속하기"
+#: verbs not suitable
+
+#: src/cword_webapp/templates/index.html:229
+msgid "You completed the crossword!"
+msgstr "크로스워드(십자말 풀이)를 완료했습니다!"
+#: crossword = 십자말 풀이 but not usually used word
+
 msgid "Easy"
 msgstr "쉬움"
 
@@ -242,9 +348,11 @@ msgstr "중간"
 
 msgid "Hard"
 msgstr "어려움"
+#: not the hard as solid...
 
 msgid "Extreme"
 msgstr "쌈@뽕함"
+#: Z-gen lang, kinda meme
 
 msgid "Geography"
 msgstr "지리학"
@@ -256,95 +364,4 @@ msgid "Science"
 msgstr "과학"
 
 msgid "Computer Science"
-msgstr "컴퓨터 과학"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "수도"
-
-#~ msgid "Countries"
-#~ msgstr "국가"
-
-#~ msgid "Easy"
-#~ msgstr "쉬운"
-
-#~ msgid "Medium"
-#~ msgstr "중간"
-
-#~ msgid "Hard"
-#~ msgstr "딱딱한"
-
-#~ msgid "Extreme"
-#~ msgstr "극심한"
-
-#~ msgid "Geography"
-#~ msgstr "지리학"
-
-#~ msgid "Science"
-#~ msgstr "과학"
-
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "셀/단어를 확인하거나 표시하려면 먼저 셀을 선택해야 합니다."
-
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "크로스워드 퍼즐 - 게임"
-
-#~ msgid "Across"
-#~ msgstr "가로"
-
-#~ msgid "Down"
-#~ msgstr "세로"
-
-#~ msgid "Reveal"
-#~ msgstr "드러내기"
-
-#~ msgid "Cell"
-#~ msgstr "칸"
-
-#~ msgid "Word"
-#~ msgstr "단어"
-
-#~ msgid "Grid"
-#~ msgstr "그리드"
-
-#~ msgid "Check"
-#~ msgstr "확인하다"
-
-#~ msgid "Clear"
-#~ msgstr "클리어"
-
-#~ msgid "Smart Skip"
-#~ msgstr "스마트 스킵"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "확대하려면 클릭하세요"
-
-#~ msgid "You are viewing"
-#~ msgstr "이미 보고있습니다"
-
-#~ msgid "from"
-#~ msgstr "~에서"
-
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "죄송합니다. 단어를 입력할 수 없습니다."
-
-#~ msgid "Word count (adjusted)"
-#~ msgstr "단어 수(조정됨)"
-
-#~ msgid "Word count"
-#~ msgstr "단어 수"
-
-#~ msgid "Continue"
-#~ msgstr "계속하기"
-
-#~ msgid "You completed the crossword!"
-#~ msgstr "크로스워드(십자말 풀이)를 완료했습니다!"
+msgstr "컴퓨터 과학"
\ No newline at end of file
diff --git a/crossword_puzzle/locales/ky/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ky/LC_MESSAGES/messages.mo
index f8d08be1d..6f01d7fc8 100644
Binary files a/crossword_puzzle/locales/ky/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ky/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ky/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ky/LC_MESSAGES/messages.po
index 2b21d9d1e..5f77adf6e 100644
--- a/crossword_puzzle/locales/ky/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ky/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ky <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Кроссворддорду көрүү"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Колдонмодон чыгуу"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобалдык орнотуулар"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Тилдер"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Өлчөмү"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "жарык"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "караңгы"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "системасы"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Көрүнүш"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "коркунучтуу"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "начар"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "орточо"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "абдан жакшы"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "кемчиликсиз"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Кроссворддун сапаты"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Артка кайрыл"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Кроссворд жүктөө"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Веб колдонмосун ачыңыз"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Веб колдонмосун токтотуу"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Сөздөрдүн санынын артыкчылыктары"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Сөздөрдүн санын тандаңыз"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максималдуу"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Ыңгайлаштырылган"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Бул операцияны аткаруу үчүн, алгач бир клетканы тандаңыз."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Көрүү"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Жабуу"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "кыйынчылык"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Жалпы сөздөр"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Кыйынчылык"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Тандоо"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Кайра жүргүзүү"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Колдонмону чын эле өчүрүп күйгүзгүңүз келеби?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Чыгыңыз"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,42 +158,43 @@ msgstr ""
 "Колдонмодон чын эле чыккыңыз келеби? Веб колдонмо иштеп жатса, ал "
 "токтотулат."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Үйгө кайтуу"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "Чын эле башкы экранга кайткыңыз келеби? Веб колдонмо токтотулат."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Ката"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Бул тил мурунтан эле тандалган."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Бул өлчөм мурунтан эле тандалган."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Бул көрүнүш мурунтан эле тандалган."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Бул сапат мурунтан эле тандалып алынган."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Маалымат"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -224,7 +216,7 @@ msgstr ""
 "колдонмо процесстери MacOS'тун Activity Monitor аркылуу токтотулушу мүмкүн, "
 "же аларды токтотуу үчүн жөн гана компьютериңизди өчүрүп күйгүзүңүз."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -236,124 +228,111 @@ msgstr ""
 "кроссворд маалыматтарына анын которулган версиясы тилдер каталогунда жок "
 "болгондо гана жеткиликтүү болот."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "Кроссворд түзүүдө ката кетти. Сураныч, консолдон кошумча маалыматты караңыз"
 
-msgid "Easy"
-msgstr "Оңой"
-
-msgid "Medium"
-msgstr "Орто"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - Оюн"
 
-msgid "Hard"
-msgstr "Катуу"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Аркылуу"
 
-msgid "Extreme"
-msgstr "Экстремалдуу"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ылдый"
 
-msgid "Geography"
-msgstr "География"
-
-msgid "Math"
-msgstr "Математика"
-
-msgid "Science"
-msgstr "Илим"
-
-msgid "Computer Science"
-msgstr "Компьютердик илим"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ачып"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Клетка"
 
-#~ msgid "Capitals"
-#~ msgstr "Капиталдар"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Сөз"
 
-#~ msgid "Countries"
-#~ msgstr "Өлкөлөр"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Тор"
 
-#~ msgid "Easy"
-#~ msgstr "Оңой"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Текшерүү"
 
-#~ msgid "Medium"
-#~ msgstr "Орто"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Тазалоо"
 
-#~ msgid "Hard"
-#~ msgstr "Катуу"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Экстремалдуу"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Чоңойтуу үчүн чыкылдатыңыз"
 
-#~ msgid "Geography"
-#~ msgstr "География"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Сиз көрүп жатасыз"
 
-#~ msgid "Science"
-#~ msgstr "Өлчөмү"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "from"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Клетканы/сөздү текшерүү же ачуу үчүн адегенде уячаны тандоо керек"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "сөз (лар) киргизүү мүмкүн эмес, кечиресиз."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Оюн"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Сөз саноо (такталган)"
 
-#~ msgid "Across"
-#~ msgstr "Арасында"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Сөз саноо"
 
-#~ msgid "Down"
-#~ msgstr "Төмөн"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Улантыңыз"
 
-#~ msgid "Reveal"
-#~ msgstr "ачуу"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Сиз кроссвордду толтурдуңуз!"
 
-#~ msgid "Cell"
-#~ msgstr "Клетка"
-
-#~ msgid "Word"
-#~ msgstr "Сөз"
-
-#~ msgid "Grid"
-#~ msgstr "Тор"
-
-#~ msgid "Check"
-#~ msgstr "Текшерүү"
-
-#~ msgid "Clear"
-#~ msgstr "Таза"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Чоңойтуу үчүн чыкылдатыңыз"
+msgid "Easy"
+msgstr "Оңой"
 
-#~ msgid "You are viewing"
-#~ msgstr "Сиз карап жатасыз"
+msgid "Medium"
+msgstr "Орто"
 
-#~ msgid "from"
-#~ msgstr "тартып"
+msgid "Hard"
+msgstr "Катуу"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "сөз(дер) киргизилбей койду, кечиресиз."
+msgid "Extreme"
+msgstr "Экстремалдуу"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Сөздөрдүн саны (түзөтүлгөн)"
+msgid "Geography"
+msgstr "География"
 
-#~ msgid "Word count"
-#~ msgstr "Сөздөрдүн саны"
+msgid "Math"
+msgstr "Математика"
 
-#~ msgid "Continue"
-#~ msgstr "Улантуу"
+msgid "Science"
+msgstr "Илим"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Сиз кроссвордду бүтүрдүңүз!"
+msgid "Computer Science"
+msgstr "Компьютердик илим"
diff --git a/crossword_puzzle/locales/la/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/la/LC_MESSAGES/messages.mo
index 66058088d..0082e8613 100644
Binary files a/crossword_puzzle/locales/la/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/la/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/la/LC_MESSAGES/messages.po b/crossword_puzzle/locales/la/LC_MESSAGES/messages.po
index 11e0551dc..651dfa7ad 100644
--- a/crossword_puzzle/locales/la/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/la/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: la <LL@li.org>\n"
@@ -19,188 +19,180 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Aenigma verbosum"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "View crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Exit app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Global Optiones"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Linguae"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Magnitudo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lux"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tenebris"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "systema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aspectus"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "TERRENUS"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pauper"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "mediocris"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "magna"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfectus"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Qualis Crossword"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Pasco"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Revertere"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Load crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Aperire telam app"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Determinare telam app"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Verbum comitem optiones"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Lego verbo comitem"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Consuetudinem"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Ad hanc operationem, oportet primum eligere cellula."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Visum"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Close"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "difficultas"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Summa verba"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "difficultas"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Lego"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Sileo"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Visne vero ut sileo app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Exitus"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr "Certus esne app exire vis? Si textus app currit, terminabitur."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Ad domum"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "Certusne es vis ire ad domum screen? Tela app terminabitur."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Error"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Lingua haec iam electus est."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Magnitudo iam delectus."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Haec species iam electus est."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Qualis iam lego."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -221,7 +213,7 @@ msgstr ""
 "Monitor Activity MacOS terminari possunt, vel computatorium tuum simpliciter"
 " sileo ut eos termines."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -233,7 +225,7 @@ msgstr ""
 "Data tesserae base tantum accessitur cum eius versio translata non adest in "
 "directorio locali."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -241,118 +233,104 @@ msgstr ""
 "Error in crossword generation occurrit. Videbis ulteriores notitias in "
 "consolatorium"
 
-msgid "Easy"
-msgstr "Securus"
-
-msgid "Medium"
-msgstr "Medium"
-
-msgid "Hard"
-msgstr "Hard"
-
-msgid "Extreme"
-msgstr "Extreme"
-
-msgid "Geography"
-msgstr "Geographia"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Scientia"
-
-msgid "Computer Science"
-msgstr "Computer Scientia"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Capital"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - Ludus"
 
-#~ msgid "Countries"
-#~ msgstr "regiones"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Trans"
 
-#~ msgid "Easy"
-#~ msgstr "Securus"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "In"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Reveho"
 
-#~ msgid "Hard"
-#~ msgstr "Hard"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cellula"
 
-#~ msgid "Extreme"
-#~ msgstr "Extreme"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Sermo"
 
-#~ msgid "Geography"
-#~ msgstr "Geographia"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ELUSUS"
 
-#~ msgid "Science"
-#~ msgstr "Magnitudo"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Reprehendo"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Ad reprimendam vel manifestandam cellam/verbum, primum cellam eligere debes"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Liquido"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Scribo - Ludus"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "SCILIOR"
 
-#~ msgid "Across"
-#~ msgstr "Per &quot;"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Click to zoom"
 
-#~ msgid "Down"
-#~ msgstr "Descende"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Tu viewing"
 
-#~ msgid "Reveal"
-#~ msgstr "Revelate"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ex"
 
-#~ msgid "Cell"
-#~ msgstr "Cellula"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Verbum (s) non inserendum, contristati."
 
-#~ msgid "Word"
-#~ msgstr "Verbum"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Verbum comitem (adaequatum)"
 
-#~ msgid "Grid"
-#~ msgstr "Eget"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Verbum comitem"
 
-#~ msgid "Check"
-#~ msgstr "Check"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Permaneo"
 
-#~ msgid "Clear"
-#~ msgstr "Patet"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Et perficitur in crossword!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "SCILIOR"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Click to zoom"
+msgid "Easy"
+msgstr "Securus"
 
-#~ msgid "You are viewing"
-#~ msgstr "Inspiceres"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "e*"
+msgid "Hard"
+msgstr "Hard"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "verbum (s) inseri non potuit, me paenitet."
+msgid "Extreme"
+msgstr "Extreme"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Verbum comitem (adaequatum)"
+msgid "Geography"
+msgstr "Geographia"
 
-#~ msgid "Word count"
-#~ msgstr "Verbum comitem"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "continue"
+msgid "Science"
+msgstr "Scientia"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Perfecisti signum crucis!"
+msgid "Computer Science"
+msgstr "Computer Scientia"
diff --git a/crossword_puzzle/locales/lb/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/lb/LC_MESSAGES/messages.mo
index 3fbba4dec..4c0f9f011 100644
Binary files a/crossword_puzzle/locales/lb/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/lb/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/lb/LC_MESSAGES/messages.po b/crossword_puzzle/locales/lb/LC_MESSAGES/messages.po
index f6266dee2..44cde6ea7 100644
--- a/crossword_puzzle/locales/lb/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/lb/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: lb <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kräizwuerträtsel"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "View crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Gitt d'App aus"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Global Astellungen"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Sproochen"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Gréisst"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "liicht"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "donkel"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "System"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ausgesinn"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "schrecklech"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "aarm"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Duerchschnëtt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "super"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfekt"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Crossword Qualitéit"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Géi zréck"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Lueden crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Open Web App"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Web App ofschléissen"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Wuertzuel Preferenzen"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Wielt Wuertzuel"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Benotzerdefinéiert"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Fir dës Operatioun ze maachen, musst Dir als éischt eng Hand wielen."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Vue"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zoumaachen"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "Schwieregkeet"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total Wierder"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Schwieregkeet"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Wielt"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Neistart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Sidd Dir sécher datt Dir d'App nei starten wëllt?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Sortie"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Sidd Dir sécher datt Dir d'App ausgoe wëllt? Wann d'Webapp leeft, gëtt se "
 "ofgeschloss."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Zréck doheem"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Sidd Dir sécher datt Dir zréck op den Heembildschierm wëllt goen? D'Web App "
 "gëtt ofgeschloss."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Feeler"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Dës Sprooch ass scho gewielt."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Dës Gréisst ass scho gewielt."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Dës Erscheinung ass scho gewielt."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Dës Qualitéit ass scho gewielt."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "goufen, kënnen duerch Activity Monitor op MacOS ofgeschloss ginn, oder "
 "einfach Äre Computer nei starten fir se ofzeschléissen."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "zougänglech wann seng iwwersat Versioun net am Locales Verzeechnes präsent "
 "ass."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "E Feeler ass geschitt an der Kreuzworträtselgeneratioun. Kuckt w.e.g. weider"
 " Informatioun an der Konsol"
 
-msgid "Easy"
-msgstr "Einfach"
-
-msgid "Medium"
-msgstr "Mëttelméisseg"
-
-msgid "Hard"
-msgstr "Schwéier"
-
-msgid "Extreme"
-msgstr "Extrem"
-
-msgid "Geography"
-msgstr "Geographie"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Wëssenschaft"
-
-msgid "Computer Science"
-msgstr "Computerentwécklungen"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Haaptstied"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crosswuert Puzzle - Spill"
 
-#~ msgid "Countries"
-#~ msgstr "Länner"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Uppannen"
 
-#~ msgid "Easy"
-#~ msgstr "Einfach"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Erof"
 
-#~ msgid "Medium"
-#~ msgstr "Mëttelméisseg"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ofwiesselnd"
 
-#~ msgid "Hard"
-#~ msgstr "Schwéier"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Zell"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Wuert"
 
-#~ msgid "Geography"
-#~ msgstr "Geographie"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Den Gëtter"
 
-#~ msgid "Science"
-#~ msgstr "Gréisst"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Um Scheck dackeg"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Fir eng Zell/Wuert z'iwwerpréiwen oder z'entdecken, musst Dir als éischt eng"
-#~ " Zell auswielen"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Liichten"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Spill"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Schmelz Auswiesselung"
 
-#~ msgid "Across"
-#~ msgstr "Iwwer"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klickt op Zoom"
 
-#~ msgid "Down"
-#~ msgstr "Down"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Dir kuckt"
 
-#~ msgid "Reveal"
-#~ msgstr "Opzeweisen"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "iwwuerten"
 
-#~ msgid "Cell"
-#~ msgstr "Zell"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Wuert (en) konnt net agebaut ginn, sorry."
 
-#~ msgid "Word"
-#~ msgstr "Wuert"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Word Zielen (ugepasst)"
 
-#~ msgid "Grid"
-#~ msgstr "Gitter"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Räisen Zielen"
 
-#~ msgid "Check"
-#~ msgstr "Check"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Weidergitt"
 
-#~ msgid "Clear"
-#~ msgstr "Kloer"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Dir hutt de Crossword ofgeschloss!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Schmelz Auswiesselung"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klickt op Zoom"
+msgid "Easy"
+msgstr "Einfach"
 
-#~ msgid "You are viewing"
-#~ msgstr "Dir kuckt"
+msgid "Medium"
+msgstr "Mëttelméisseg"
 
-#~ msgid "from"
-#~ msgstr "vun"
+msgid "Hard"
+msgstr "Schwéier"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Wuert(e) konnten net agefouert ginn, sorry."
+msgid "Extreme"
+msgstr "Extrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Wortzuel (ugepasst)"
+msgid "Geography"
+msgstr "Geographie"
 
-#~ msgid "Word count"
-#~ msgstr "Wuertzuel"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Fuert weider"
+msgid "Science"
+msgstr "Wëssenschaft"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Dir hutt d'Kräizwuert fäerdeg gemaach!"
+msgid "Computer Science"
+msgstr "Computerentwécklungen"
diff --git a/crossword_puzzle/locales/lo/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/lo/LC_MESSAGES/messages.mo
index 371454a82..5608873b5 100644
Binary files a/crossword_puzzle/locales/lo/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/lo/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/lo/LC_MESSAGES/messages.po b/crossword_puzzle/locales/lo/LC_MESSAGES/messages.po
index 4f2c66424..59953c686 100644
--- a/crossword_puzzle/locales/lo/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/lo/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: lo <LL@li.org>\n"
@@ -19,189 +19,181 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ເກມປິດສະໜາ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ເບິ່ງ crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ອອກຈາກແອັບ"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ການຕັ້ງຄ່າທົ່ວໂລກ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ພາສາ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ຂະໜາດ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ແສງສະຫວ່າງ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ມືດ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ລະບົບ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "ຮູບລັກສະນະ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ເປັນຕາຍ້ານ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ທຸກຍາກ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ສະເລ່ຍ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ອະນັນຕະ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ຜ່ອງແຜ້ວ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ຄຸນນະພາບຂອງຂໍ້"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "ຕົວທ່ອງເວັບຂອງ Crossword"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ກັບ​ຄືນ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ໂຫຼດ crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ເປີດແອັບເວັບ"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ຢຸດແອັບເວັບ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "ການຕັ້ງຄ່າການນັບຄໍາ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "ເລືອກການນັບຄໍາ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "ສູງສຸດ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "ກຳນົດເອງ"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ເພື່ອປະຕິບັດການປະຕິບັດງານນີ້, ກ່ອນອື່ນຫມົດທ່ານຕ້ອງເລືອກເອົາຫ້ອງ."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ເບິ່ງ"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ປິດ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ຄວາມຫຍຸ້ງຍາກ"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ຄຳສັບທັງໝົດ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ຄວາມຫຍຸ້ງຍາກ"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ເລືອກ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "ເລີ່ມ​ຕົ້ນ​ໃຫມ່"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການຣີສະຕາດແອັບ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ອອກໄປ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr ""
 "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການອອກຈາກແອັບ? ຖ້າແອັບເວັບກຳລັງເຮັດວຽກຢູ່, ມັນຈະຖືກປິດ."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ກັບໄປຫາບ້ານ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການກັບໄປໜ້າຈໍຫຼັກ? ແອັບເວັບຈະຖືກປິດ."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ຜິດພາດ"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ພາສານີ້ຖືກເລືອກແລ້ວ."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ຂະໜາດນີ້ຖືກເລືອກແລ້ວ."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ລັກສະນະນີ້ຖືກເລືອກແລ້ວ."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ຄຸນນະພາບນີ້ໄດ້ຖືກຄັດເລືອກແລ້ວ."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ຂໍ້ມູນ"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -224,7 +216,7 @@ msgstr ""
 "Activity Monitor ໃນ MacOS, "
 "ຫຼືພຽງແຕ່ປິດເປີດຄອມພິວເຕີຂອງທ່ານຄືນໃໝ່ເພື່ອຢຸດພວກມັນ."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -236,124 +228,111 @@ msgstr ""
 "ຫມາຍເຫດ: ຂໍ້ມູນ crossword "
 "ພື້ນຖານແມ່ນເຂົ້າເຖິງພຽງແຕ່ເມື່ອສະບັບແປຂອງມັນບໍ່ມີຢູ່ໃນໄດເລກະທໍລີທ້ອງຖິ່ນ."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "ຂໍ້ຜິດພາດເກີດຂຶ້ນໃນການຜະລິດ crossword. ກະລຸນາເບິ່ງຂໍ້ມູນເພີ່ມເຕີມໃນ console"
 
-msgid "Easy"
-msgstr "ງ່າຍ"
-
-msgid "Medium"
-msgstr "ຂະຫນາດກາງ"
-
-msgid "Hard"
-msgstr "ແຂງ"
-
-msgid "Extreme"
-msgstr "ທີ່ສຸດ"
-
-msgid "Geography"
-msgstr "ພູມສາດ"
-
-msgid "Math"
-msgstr "ຄະນິດສາດ"
-
-msgid "Science"
-msgstr "ວິທະຍາສາດ"
-
-msgid "Computer Science"
-msgstr "ວິ​ທະ​ຍາ​ສາດ​ຄອມ​ພິວ​ເຕີ"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "ນະຄອນຫຼວງ"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ປິດສະ Crossword - ເກມ"
 
-#~ msgid "Countries"
-#~ msgstr "ປະເທດ"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ຂ້າມ"
 
-#~ msgid "Easy"
-#~ msgstr "ງ່າຍ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ລົງ"
 
-#~ msgid "Medium"
-#~ msgstr "ຂະຫນາດກາງ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "ເປີດເຜີຍ"
 
-#~ msgid "Hard"
-#~ msgstr "ແຂງ"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ຫ້ອງ"
 
-#~ msgid "Extreme"
-#~ msgstr "ທີ່ສຸດ"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "ຄໍາ"
 
-#~ msgid "Geography"
-#~ msgstr "ພູມສາດ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ຕາຂ່າຍໄຟຟ້າ"
 
-#~ msgid "Science"
-#~ msgstr "ຂະໜາດ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ກວດກາ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "ເພື່ອກວດສອບ ຫຼືເປີດເຜີຍເຊລ/ຄຳສັບ, ກ່ອນອື່ນຕ້ອງເລືອກເຊລ"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ແຈ່ມແຈ້ງ"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ເກມແຂ່ງລົດ Crossword - ເກມ"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "skiip smart"
 
-#~ msgid "Across"
-#~ msgstr "ຂ້າມ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ກົດເພື່ອຂະຫຍາຍ"
 
-#~ msgid "Down"
-#~ msgstr "ລົງ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "ທ່ານກໍາລັງເບິ່ງ"
 
-#~ msgid "Reveal"
-#~ msgstr "ເປີດເຜີຍ"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ແຕ່"
 
-#~ msgid "Cell"
-#~ msgstr "ເຊລ"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ຄໍາສັບທີ່ບໍ່ສາມາດໃສ່ໄດ້, ຂໍອະໄພ."
 
-#~ msgid "Word"
-#~ msgstr "ຄໍາ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "ການນັບຄໍາ (ປັບຕົວ)"
 
-#~ msgid "Grid"
-#~ msgstr "ຕາຂ່າຍໄຟຟ້າ"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "ຄໍານັບ"
 
-#~ msgid "Check"
-#~ msgstr "ກວດສອບ"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ດໍາເນີນຕໍ່ໄປ"
 
-#~ msgid "Clear"
-#~ msgstr "ຈະແຈ້ງ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "ທ່ານໄດ້ສໍາເລັດ crossword!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "skiip smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ກົດເພື່ອຂະຫຍາຍ"
+msgid "Easy"
+msgstr "ງ່າຍ"
 
-#~ msgid "You are viewing"
-#~ msgstr "ທ່ານກໍາລັງເບິ່ງ"
+msgid "Medium"
+msgstr "ຂະຫນາດກາງ"
 
-#~ msgid "from"
-#~ msgstr "ຈາກ"
+msgid "Hard"
+msgstr "ແຂງ"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ບໍ່ສາມາດໃສ່ຄຳສັບໄດ້, ຂໍໂທດ."
+msgid "Extreme"
+msgstr "ທີ່ສຸດ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "ຈຳນວນຄຳສັບ (ປັບ)"
+msgid "Geography"
+msgstr "ພູມສາດ"
 
-#~ msgid "Word count"
-#~ msgstr "ການນັບຄໍາ"
+msgid "Math"
+msgstr "ຄະນິດສາດ"
 
-#~ msgid "Continue"
-#~ msgstr "ສືບຕໍ່"
+msgid "Science"
+msgstr "ວິທະຍາສາດ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "ທ່ານ​ໄດ້​ສໍາ​ເລັດ crossword​!"
+msgid "Computer Science"
+msgstr "ວິ​ທະ​ຍາ​ສາດ​ຄອມ​ພິວ​ເຕີ"
diff --git a/crossword_puzzle/locales/lt/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/lt/LC_MESSAGES/messages.mo
index b9f0c3e53..69f95ff92 100644
Binary files a/crossword_puzzle/locales/lt/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/lt/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/lt/LC_MESSAGES/messages.po b/crossword_puzzle/locales/lt/LC_MESSAGES/messages.po
index 730fd313f..db2abc1d6 100644
--- a/crossword_puzzle/locales/lt/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/lt/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: lt <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kryžiažodis"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Peržiūrėkite kryžiažodžius"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Išeikite iš programos"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Visuotiniai nustatymai"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Kalbos"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Dydis"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "šviesos"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tamsus"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Išvaizda"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "baisus"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "vargšas"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "vidurkis"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Puiku"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "puikus"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kryžiažodžių kokybė"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Kryžiažodžių naršyklė"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Eik atgal"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Įkelti kryžiažodį"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Atidarykite žiniatinklio programą"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Nutraukti žiniatinklio programą"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Žodžių skaičiaus nuostatos"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pasirinkite žodžių skaičių"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimalus"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Pasirinktinis"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Norėdami atlikti šią operaciją, pirmiausia turite pasirinkti langelį."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Žiūrėti"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Uždaryti"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "sunkumas"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Iš viso žodžių"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Sunkumas"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pasirinkite"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Perkrauti"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ar tikrai norite iš naujo paleisti programą?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Išeiti"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ar tikrai norite išeiti iš programos? Jei žiniatinklio programa veikia, ji "
 "bus nutraukta."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Grįžti namo"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ar tikrai norite grįžti į pagrindinį ekraną? Žiniatinklio programa bus "
 "nutraukta."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Klaida"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ši kalba jau pasirinkta."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Šis dydis jau pasirinktas."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ši išvaizda jau pasirinkta."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ši kokybė jau pasirinkta."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informacija"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "nutraukti naudojant „Activity Monitor“ sistemoje „MacOS“ arba tiesiog iš "
 "naujo paleiskite kompiuterį, kad juos nutrauktumėte."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,126 +230,111 @@ msgstr ""
 "kryžiažodžių duomenys pasiekiami tik tada, kai jų išverstos versijos nėra "
 "lokalių kataloge."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "Kuriant kryžiažodžius įvyko klaida. Daugiau informacijos rasite konsolėje"
 
-msgid "Easy"
-msgstr "Lengva"
-
-msgid "Medium"
-msgstr "Vidutinis"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Kryžiažodis - žaidimas"
 
-msgid "Hard"
-msgstr "Sunku"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Skersai"
 
-msgid "Extreme"
-msgstr "Ekstremalus"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Žemyn"
 
-msgid "Geography"
-msgstr "Geografija"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Mokslas"
-
-msgid "Computer Science"
-msgstr "Informatika"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Atskleisti"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ląstelė"
 
-#~ msgid "Capitals"
-#~ msgstr "Sostinės"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Žodis"
 
-#~ msgid "Countries"
-#~ msgstr "Šalys"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Tinklelis"
 
-#~ msgid "Easy"
-#~ msgstr "Lengva"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Patikrinti"
 
-#~ msgid "Medium"
-#~ msgstr "Vidutinis"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Aišku"
 
-#~ msgid "Hard"
-#~ msgstr "Sunku"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Protingas praleidimas"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstremalus"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Spustelėkite, kad padidintumėte mastelį"
 
-#~ msgid "Geography"
-#~ msgstr "Geografija"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Jūs žiūrite"
 
-#~ msgid "Science"
-#~ msgstr "Dydis"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "nuo"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Norėdami patikrinti arba atskleisti langelį / žodį, pirmiausia turite "
-#~ "pasirinkti langelį"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Žodis (-ai) negalėjo būti įterptas, atsiprašau."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Kryžiažodis – žaidimas"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Žodžių skaičius (pakoreguotas)"
 
-#~ msgid "Across"
-#~ msgstr "Skersai"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Žodžių skaičius"
 
-#~ msgid "Down"
-#~ msgstr "Žemyn"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Tęsti"
 
-#~ msgid "Reveal"
-#~ msgstr "Atskleisti"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Jūs baigėte kryžiažodį!"
 
-#~ msgid "Cell"
-#~ msgstr "Ląstelė"
-
-#~ msgid "Word"
-#~ msgstr "Žodis"
-
-#~ msgid "Grid"
-#~ msgstr "Tinklelis"
-
-#~ msgid "Check"
-#~ msgstr "Patikrinti"
-
-#~ msgid "Clear"
-#~ msgstr "Aišku"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Protingas praleidimas"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Spustelėkite, kad padidintumėte mastelį"
+msgid "Easy"
+msgstr "Lengva"
 
-#~ msgid "You are viewing"
-#~ msgstr "Jūs žiūrite"
+msgid "Medium"
+msgstr "Vidutinis"
 
-#~ msgid "from"
-#~ msgstr "iš"
+msgid "Hard"
+msgstr "Sunku"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "žodžio (-ių) įterpti nepavyko, atsiprašome."
+msgid "Extreme"
+msgstr "Ekstremalus"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Žodžių skaičius (koreguotas)"
+msgid "Geography"
+msgstr "Geografija"
 
-#~ msgid "Word count"
-#~ msgstr "Žodžių skaičius"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Tęsti"
+msgid "Science"
+msgstr "Mokslas"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Jūs užbaigėte kryžiažodį!"
+msgid "Computer Science"
+msgstr "Informatika"
diff --git a/crossword_puzzle/locales/lv/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/lv/LC_MESSAGES/messages.mo
index 3af98e1fd..31430eeb1 100644
Binary files a/crossword_puzzle/locales/lv/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/lv/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/lv/LC_MESSAGES/messages.po b/crossword_puzzle/locales/lv/LC_MESSAGES/messages.po
index 8179a7e0e..681326381 100644
--- a/crossword_puzzle/locales/lv/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/lv/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: lv <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krustvārdu mīkla"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Skatīt krustvārdu mīklas"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Izejiet no lietotnes"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globālie iestatījumi"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Valodas"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Izmērs"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "gaismas"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tumšs"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistēma"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Izskats"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "briesmīgs"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "nabadzīgs"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "vidējs"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "liels"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "pilnīgs"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krustvārdu kvalitāte"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Krustvārdu mīklas pārlūks"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Atgriezties"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Ielādēt krustvārdu mīklu"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Atveriet tīmekļa lietotni"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Pārtraukt tīmekļa lietotni"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Vārdu skaita preferences"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Izvēlieties vārdu skaitu"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimums"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Pielāgots"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Lai veiktu šo darbību, vispirms jāizvēlas šūna."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Skatīt"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Aizvērt"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "grūtības"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Vārdu kopskaits"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Grūtības"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Izvēlieties"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Restartēt"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Vai tiešām vēlaties restartēt lietotni?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Izeja"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Vai tiešām vēlaties iziet no lietotnes? Ja tīmekļa lietotne darbojas, tā "
 "tiks pārtraukta."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Atpakaļ uz mājām"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Vai tiešām vēlaties atgriezties sākuma ekrānā? Tīmekļa lietotnes darbība "
 "tiks pārtraukta."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Kļūda"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Šī valoda jau ir atlasīta."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Šis izmērs jau ir atlasīts."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Šis izskats jau ir atlasīts."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Šī kvalitāte jau ir izvēlēta."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informācija"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "var pārtraukt, izmantojot Activity Monitor operētājsistēmā MacOS, vai "
 "vienkārši restartējiet datoru, lai tos pārtrauktu."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,124 +230,111 @@ msgstr ""
 "Krustvārdu pamatdatiem var piekļūt tikai tad, ja to tulkotā versija nav "
 "atrodama lokalizāciju direktorijā."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "Krustvārdu ģenerēšanā radās kļūda. Plašāku informāciju skatiet konsolē"
 
-msgid "Easy"
-msgstr "Viegli"
-
-msgid "Medium"
-msgstr "Vidēja"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krustvārdu mīkla - spēle"
 
-msgid "Hard"
-msgstr "Grūti"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Pāri"
 
-msgid "Extreme"
-msgstr "Ekstrēms"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Uz leju"
 
-msgid "Geography"
-msgstr "Ģeogrāfija"
-
-msgid "Math"
-msgstr "Matemātika"
-
-msgid "Science"
-msgstr "Zinātne"
-
-msgid "Computer Science"
-msgstr "Datorzinātne"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Atklāt"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Šūna"
 
-#~ msgid "Capitals"
-#~ msgstr "Galvaspilsētas"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Vārdot"
 
-#~ msgid "Countries"
-#~ msgstr "valstis"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Lakta"
 
-#~ msgid "Easy"
-#~ msgstr "Viegli"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Pārbaudīt"
 
-#~ msgid "Medium"
-#~ msgstr "Vidēja"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Noskaidrot"
 
-#~ msgid "Hard"
-#~ msgstr "Grūti"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Gudra izlaišana"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstrēms"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Noklikšķiniet, lai tuvinātu"
 
-#~ msgid "Geography"
-#~ msgstr "Ģeogrāfija"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Jūs skatāties"
 
-#~ msgid "Science"
-#~ msgstr "Izmērs"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "no"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Lai pārbaudītu vai atklātu šūnu/vārdu, vispirms ir jāatlasa šūna"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Vārdu (-us) nevarēja ievietot, atvainojiet."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krustvārdu mīkla — spēle"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Vārdu skaits (pielāgots)"
 
-#~ msgid "Across"
-#~ msgstr "Pāri"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Vārdu skaits"
 
-#~ msgid "Down"
-#~ msgstr "Uz leju"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Turpināt"
 
-#~ msgid "Reveal"
-#~ msgstr "Atklājiet"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Jūs pabeidzāt krustvārdu!"
 
-#~ msgid "Cell"
-#~ msgstr "Šūna"
-
-#~ msgid "Word"
-#~ msgstr "Vārds"
-
-#~ msgid "Grid"
-#~ msgstr "Režģis"
-
-#~ msgid "Check"
-#~ msgstr "Pārbaudiet"
-
-#~ msgid "Clear"
-#~ msgstr "Skaidrs"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Gudra izlaišana"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Noklikšķiniet, lai tuvinātu"
+msgid "Easy"
+msgstr "Viegli"
 
-#~ msgid "You are viewing"
-#~ msgstr "Jūs skatāties"
+msgid "Medium"
+msgstr "Vidēja"
 
-#~ msgid "from"
-#~ msgstr "no"
+msgid "Hard"
+msgstr "Grūti"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "vārdu(s) nevarēja ievietot, atvainojiet."
+msgid "Extreme"
+msgstr "Ekstrēms"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Vārdu skaits (pielāgots)"
+msgid "Geography"
+msgstr "Ģeogrāfija"
 
-#~ msgid "Word count"
-#~ msgstr "Vārdu skaits"
+msgid "Math"
+msgstr "Matemātika"
 
-#~ msgid "Continue"
-#~ msgstr "Turpināt"
+msgid "Science"
+msgstr "Zinātne"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Jūs pabeidzāt krustvārdu mīklu!"
+msgid "Computer Science"
+msgstr "Datorzinātne"
diff --git a/crossword_puzzle/locales/mg/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/mg/LC_MESSAGES/messages.mo
index 7299059ce..e7d4a3a45 100644
Binary files a/crossword_puzzle/locales/mg/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/mg/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/mg/LC_MESSAGES/messages.po b/crossword_puzzle/locales/mg/LC_MESSAGES/messages.po
index 761833c17..1499d4ad7 100644
--- a/crossword_puzzle/locales/mg/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/mg/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: mg <LL@li.org>\n"
@@ -19,149 +19,140 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Puzzle Crossword"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Jereo ny crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Mialà amin'ny app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Global Settings"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "fiteny"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Size"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "fahazavana"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "maizina"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "RAFITRA"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Bika Aman 'endrika"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "mahatsiravina"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "MAHANTRA"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Average"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "LEHIBE"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "tonga lafatra"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kalitao crossword"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Hiverina"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Load crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Sokafy ny app web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Atsaharo ny app web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Safidy isan'ny teny"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Fidio ny isan'ny teny"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Faratampony"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "fanao"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Mba hanatanterahana io fandidiana io dia tsy maintsy misafidy sela aloha "
 "ianao."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "View"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "AKAIKY"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "fahasarotana"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total teny"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "fahasarotana"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Select"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Haverina velomina"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Tena te hamerina ny fampiharana ve ianao?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Fivoahana"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -169,11 +160,11 @@ msgstr ""
 "Tena te hiala amin'ny fampiharana ve ianao? Raha mandeha ny app web dia "
 "hofoanana izany."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Miverina any an-trano"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -181,32 +172,33 @@ msgstr ""
 "Tena te hiverina any amin'ny efijery an-trano ve ianao? Hatsahatra ny app "
 "web."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "fahadisoana"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Efa voafantina ity fiteny ity."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Efa voafantina io habe io."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ity endrika ity dia efa voafantina."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ity kalitao ity dia efa voafantina."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -230,7 +222,7 @@ msgstr ""
 " amin'ny alàlan'ny Activity Monitor amin'ny MacOS, na, avereno fotsiny ny "
 "solosainao mba hamaranana azy ireo."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -243,7 +235,7 @@ msgstr ""
 " miditra afa-tsy rehefa tsy hita ao amin'ny lahatahiry locales ny dikan-teny"
 " voadikany."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -251,119 +243,104 @@ msgstr ""
 "Nisy hadisoana niseho tamin'ny famoronana teny fanalahidy. Azafady, jereo ny"
 " fampahalalana fanampiny ao amin'ny console"
 
-msgid "Easy"
-msgstr "Mora"
-
-msgid "Medium"
-msgstr "SALASALANY"
-
-msgid "Hard"
-msgstr "Sarotra"
-
-msgid "Extreme"
-msgstr "tena"
-
-msgid "Geography"
-msgstr "jeografia"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Science"
-
-msgid "Computer Science"
-msgstr "Informatika"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "kapitaly"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Piozila crossword - lalao"
 
-#~ msgid "Countries"
-#~ msgstr "TANY"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "manerana"
 
-#~ msgid "Easy"
-#~ msgstr "Mora"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Midina"
 
-#~ msgid "Medium"
-#~ msgstr "SALASALANY"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "hita"
 
-#~ msgid "Hard"
-#~ msgstr "Sarotra"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "SELA"
 
-#~ msgid "Extreme"
-#~ msgstr "tena"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "teny"
 
-#~ msgid "Geography"
-#~ msgstr "jeografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Fefy"
 
-#~ msgid "Science"
-#~ msgstr "Size"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Taratasim-bola"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Raha te hanamarina na hanambara sela/teny iray dia tsy maintsy misafidy sela"
-#~ " iray aloha ianao"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Mazava"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Puzzle Crossword - Lalao"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart skip"
 
-#~ msgid "Across"
-#~ msgstr "manerana"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kitiho raha te-zotra"
 
-#~ msgid "Down"
-#~ msgstr "Midina"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Mijery ianao"
 
-#~ msgid "Reveal"
-#~ msgstr "hita"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "From"
 
-#~ msgid "Cell"
-#~ msgstr "SELA"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ny teny (s) dia tsy azo ampidirina, miala tsiny."
 
-#~ msgid "Word"
-#~ msgstr "teny"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Teny isa (namboarina)"
 
-#~ msgid "Grid"
-#~ msgstr "Fefy"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Word Count"
 
-#~ msgid "Check"
-#~ msgstr "Taratasim-bola"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "FOANA"
 
-#~ msgid "Clear"
-#~ msgstr "Mazava"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Vita ny crossword!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Smart skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kitiho raha te-zotra"
+msgid "Easy"
+msgstr "Mora"
 
-#~ msgid "You are viewing"
-#~ msgstr "Mijery ianao"
+msgid "Medium"
+msgstr "SALASALANY"
 
-#~ msgid "from"
-#~ msgstr "From"
+msgid "Hard"
+msgstr "Sarotra"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "tsy azo ampidirina ny teny, miala tsiny."
+msgid "Extreme"
+msgstr "tena"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Isan'ny teny (nahitsy)"
+msgid "Geography"
+msgstr "jeografia"
 
-#~ msgid "Word count"
-#~ msgstr "isan'ny teny"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "FOANA"
+msgid "Science"
+msgstr "Science"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Nahavita ny crossword ianao!"
+msgid "Computer Science"
+msgstr "Informatika"
diff --git a/crossword_puzzle/locales/mi/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/mi/LC_MESSAGES/messages.mo
index 2b7ff6b23..30ca4e0d9 100644
Binary files a/crossword_puzzle/locales/mi/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/mi/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/mi/LC_MESSAGES/messages.po b/crossword_puzzle/locales/mi/LC_MESSAGES/messages.po
index 41530fa60..7f1539f51 100644
--- a/crossword_puzzle/locales/mi/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/mi/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: mi <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Whakawhiti Kupu"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Tirohia nga kupu whakawhiti"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Puta atu i te taupānga"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Tautuhinga Ao"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Nga reo"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Rahi"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "marama"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "pouri"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "pūnaha"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Te ahua"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "wehi"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pōhara"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "tau toharite"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "nui"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "tutuki"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kounga Whakatau"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Pūtirotiro Crossword"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Hoki atu"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Utaina te kupu whakawhiti"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Tuwhera te taupānga tukutuku"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Whakamutua te taupānga tukutuku"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Nga manakohanga tatau kupu"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Tīpakohia te tatau kupu"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Mōrahi"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Ritenga"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Ki te mahi i tenei mahinga, me matua whiriwhiri koe i tetahi pūtau."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Tirohanga"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Katia"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "uaua"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Kupu katoa"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Te uaua"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Tīpakohia"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Tīmata anō"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Kei te tino hiahia koe ki te whakaara ano i te taupānga?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Putaatu"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Kei te tino hiahia koe ki te puta atu i te taupānga? Mena kei te rere te "
 "taupānga tukutuku, ka mutu."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Hoki ki te kainga"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Kei te tino hiahia koe ki te hoki ki te mata o te kainga? Ka whakamutua te "
 "taupānga tukutuku."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Hapa"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Kua tohua kē tēnei reo."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Kua tohua kē tēnei rahi."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Kua tohua kē tēnei ahua."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kua tohua tenei kounga."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Nga korero"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "Aroturuki Mahi i runga i te MacOS, me whakaara ano ranei i to rorohiko ki te"
 " whakamutu."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "cwords. FAKATOKANGA: Ka uru noa nga raraunga kupu whakawhiti i te wa kaore "
 "tana putanga kua whakamaoritia i roto i te raarangi rohe."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "I puta he hapa i te whakaputa kupu whakawhiti. Tirohia etahi atu korero kei "
 "roto i te papatohu"
 
-msgid "Easy"
-msgstr "Māmā"
-
-msgid "Medium"
-msgstr "Waenga"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle puzziar - kēmu"
 
-msgid "Hard"
-msgstr "pakeke"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Tīpae"
 
-msgid "Extreme"
-msgstr "Tino"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Iho"
 
-msgid "Geography"
-msgstr "Matawhenua"
-
-msgid "Math"
-msgstr "Pāngarau"
-
-msgid "Science"
-msgstr "Pūtaiao"
-
-msgid "Computer Science"
-msgstr "Pūtaiao Rorohiko"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Whāki"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Rūma herehere"
 
-#~ msgid "Capitals"
-#~ msgstr "Nga whakapaipai"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Kupu"
 
-#~ msgid "Countries"
-#~ msgstr "Nga whenua"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Papakā"
 
-#~ msgid "Easy"
-#~ msgstr "Māmā"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Haki"
 
-#~ msgid "Medium"
-#~ msgstr "Waenga"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Purata"
 
-#~ msgid "Hard"
-#~ msgstr "pakeke"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart smart"
 
-#~ msgid "Extreme"
-#~ msgstr "Tino"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Patohia ki te whakauru"
 
-#~ msgid "Geography"
-#~ msgstr "Matawhenua"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Kei te tiro koe"
 
-#~ msgid "Science"
-#~ msgstr "Rahi"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "mai"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Hei taki, hei whakaatu ranei i tetahi pūtau/kupu, me matua kowhiria e koe "
-#~ "tetahi pūtau"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Kaore i taea te whakauru i nga kupu (kaore i taea te whakauru."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Whakawhiti Kupu - Kemu"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kupu kupu (whakatika)"
 
-#~ msgid "Across"
-#~ msgstr "Puta noa"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Kupu kupu"
 
-#~ msgid "Down"
-#~ msgstr "Ki raro"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Tonu"
 
-#~ msgid "Reveal"
-#~ msgstr "Whakakitea"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Kua oti i a koe te kupu whakatika!"
 
-#~ msgid "Cell"
-#~ msgstr "Pūtau"
-
-#~ msgid "Word"
-#~ msgstr "Kupu"
-
-#~ msgid "Grid"
-#~ msgstr "Mātiti"
-
-#~ msgid "Check"
-#~ msgstr "Takitaki"
-
-#~ msgid "Clear"
-#~ msgstr "Maamaa"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Patohia ki te whakauru"
+msgid "Easy"
+msgstr "Māmā"
 
-#~ msgid "You are viewing"
-#~ msgstr "Kei te matakitaki koe"
+msgid "Medium"
+msgstr "Waenga"
 
-#~ msgid "from"
-#~ msgstr "mai"
+msgid "Hard"
+msgstr "pakeke"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "kore e taea te whakauru kupu, aroha mai."
+msgid "Extreme"
+msgstr "Tino"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Tatau kupu (kua whakatikatika)"
+msgid "Geography"
+msgstr "Matawhenua"
 
-#~ msgid "Word count"
-#~ msgstr "Tatau kupu"
+msgid "Math"
+msgstr "Pāngarau"
 
-#~ msgid "Continue"
-#~ msgstr "Haere tonu"
+msgid "Science"
+msgstr "Pūtaiao"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Kua oti i a koe te kupu whakawhiti!"
+msgid "Computer Science"
+msgstr "Pūtaiao Rorohiko"
diff --git a/crossword_puzzle/locales/mk/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/mk/LC_MESSAGES/messages.mo
index 5876e4053..99a16c3b5 100644
Binary files a/crossword_puzzle/locales/mk/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/mk/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/mk/LC_MESSAGES/messages.po b/crossword_puzzle/locales/mk/LC_MESSAGES/messages.po
index fecd91b50..6202f6fd2 100644
--- a/crossword_puzzle/locales/mk/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/mk/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: mk <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Крстозбор"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Погледнете ги крстозборите"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Излезете од апликацијата"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобални поставки"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Јазици"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Големина"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "светлина"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "темно"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "систем"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Изглед"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "страшно"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "сиромашен"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "просек"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Одлично"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "совршено"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Квалитет на крстозбор"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Прелистувач на крстозбори"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Врати се назад"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Вчитај крстозбор"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Отворете веб-апликација"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Прекинете ја веб-апликацијата"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Преференци за броење зборови"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Изберете број на зборови"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максимум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Прилагодено"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "За да ја извршите оваа операција, прво мора да изберете ќелија."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Прикажи"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Затвори"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "тешкотија"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Вкупно зборови"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Тешкотија"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Изберете"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Рестарт"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Дали сте сигурни дека сакате да ја рестартирате апликацијата?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Излезете"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Дали сте сигурни дека сакате да излезете од апликацијата? Ако веб-"
 "апликацијата работи, таа ќе се прекине."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Назад до дома"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Дали сте сигурни дека сакате да се вратите на почетниот екран? Веб-"
 "апликацијата ќе се прекине."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Грешка"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Овој јазик е веќе избран."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Оваа големина е веќе избрана."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Овој изглед е веќе избран."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Овој квалитет е веќе избран."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Инфо"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "прекинати може да се прекинат преку Activity Monitor на MacOS или едноставно"
 " рестартирајте го компјутерот за да ги прекинете."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "само кога нивната преведена верзија не е присутна во директориумот за "
 "локалитети."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,118 +239,104 @@ msgstr ""
 "Настана грешка при генерирањето крстозбор. Погледнете повеќе информации во "
 "конзолата"
 
-msgid "Easy"
-msgstr "Лесно"
-
-msgid "Medium"
-msgstr "Средно"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Загатка за крстозбор - игра"
 
-msgid "Hard"
-msgstr "Тешко"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Преку"
 
-msgid "Extreme"
-msgstr "Екстремни"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Долу"
 
-msgid "Geography"
-msgstr "Географија"
-
-msgid "Math"
-msgstr "Математика"
-
-msgid "Science"
-msgstr "Науката"
-
-msgid "Computer Science"
-msgstr "Компјутерски науки"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Открива"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ќелија"
 
-#~ msgid "Capitals"
-#~ msgstr "Капитали"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Збор"
 
-#~ msgid "Countries"
-#~ msgstr "Земји"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Мрежа"
 
-#~ msgid "Easy"
-#~ msgstr "Лесно"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Проверете"
 
-#~ msgid "Medium"
-#~ msgstr "Средно"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Чиста"
 
-#~ msgid "Hard"
-#~ msgstr "Тешко"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Паметно прескокнување"
 
-#~ msgid "Extreme"
-#~ msgstr "Екстремни"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Кликнете за да зумирате"
 
-#~ msgid "Geography"
-#~ msgstr "Географија"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Гледате"
 
-#~ msgid "Science"
-#~ msgstr "Големина"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "од"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "За да проверите или откриете ќелија/збор, прво мора да изберете ќелија"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Зборот (а) не можеше да се вметне, извинете."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Крстозбор загатка - игра"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Број на зборови (прилагодено)"
 
-#~ msgid "Across"
-#~ msgstr "Преку"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Бројот на зборови"
 
-#~ msgid "Down"
-#~ msgstr "Долу"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Продолжете"
 
-#~ msgid "Reveal"
-#~ msgstr "Открива"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Го завршивте крстозборот!"
 
-#~ msgid "Cell"
-#~ msgstr "Ќелија"
-
-#~ msgid "Word"
-#~ msgstr "збор"
-
-#~ msgid "Grid"
-#~ msgstr "Мрежа"
-
-#~ msgid "Check"
-#~ msgstr "Проверете"
-
-#~ msgid "Clear"
-#~ msgstr "Јасно"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Паметно прескокнување"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Кликнете за да зумирате"
+msgid "Easy"
+msgstr "Лесно"
 
-#~ msgid "You are viewing"
-#~ msgstr "Вие гледате"
+msgid "Medium"
+msgstr "Средно"
 
-#~ msgid "from"
-#~ msgstr "од"
+msgid "Hard"
+msgstr "Тешко"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "збор(и) не можеше да се вметне, извинете."
+msgid "Extreme"
+msgstr "Екстремни"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Број на зборови (прилагоден)"
+msgid "Geography"
+msgstr "Географија"
 
-#~ msgid "Word count"
-#~ msgstr "Бројот на зборови"
+msgid "Math"
+msgstr "Математика"
 
-#~ msgid "Continue"
-#~ msgstr "Продолжи"
+msgid "Science"
+msgstr "Науката"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Го завршивте крстозборот!"
+msgid "Computer Science"
+msgstr "Компјутерски науки"
diff --git a/crossword_puzzle/locales/ml/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ml/LC_MESSAGES/messages.mo
index 806615f49..e25d651a3 100644
Binary files a/crossword_puzzle/locales/ml/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ml/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ml/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ml/LC_MESSAGES/messages.po
index b8e900d16..51508aa10 100644
--- a/crossword_puzzle/locales/ml/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ml/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ml <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ക്രോസ്വേഡ് പസിൽ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ക്രോസ്വേഡുകൾ കാണുക"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ആപ്പിൽ നിന്ന് പുറത്തുകടക്കുക"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ആഗോള ക്രമീകരണങ്ങൾ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ഭാഷകൾ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "വലിപ്പം"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "വെളിച്ചം"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ഇരുണ്ട"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "സിസ്റ്റം"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "രൂപഭാവം"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ദാരുണമായ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ദരിദനായ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ശരാശരി"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "മഹത്തായ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "പൂര്ണ്ണമാക്കുക"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ക്രോസ്വേഡ് ഗുണമേന്മ"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "ക്രോസ്വേഡ് ബ്രൗസർ"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "മടങ്ങിപ്പോവുക"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ക്രോസ്വേഡ് ലോഡ് ചെയ്യുക"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "വെബ് ആപ്പ് തുറക്കുക"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "വെബ് ആപ്പ് അവസാനിപ്പിക്കുക"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "വാക്കുകളുടെ എണ്ണം മുൻഗണനകൾ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "വാക്കുകളുടെ എണ്ണം തിരഞ്ഞെടുക്കുക"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "പരമാവധി"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "കസ്റ്റം"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ഈ പ്രവർത്തനം നടത്താൻ, നിങ്ങൾ ആദ്യം ഒരു സെൽ തിരഞ്ഞെടുക്കണം."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "കാണുക"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "അടയ്ക്കുക"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ബുദ്ധിമുട്ട്"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ആകെ വാക്കുകൾ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ബുദ്ധിമുട്ട്"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "തിരഞ്ഞെടുക്കുക"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "പുനരാരംഭിക്കുക"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "ആപ്പ് പുനരാരംഭിക്കണമെന്ന് തീർച്ചയാണോ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "പുറത്ത്"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "ആപ്പിൽ നിന്ന് പുറത്തുകടക്കണമെന്ന് തീർച്ചയാണോ? വെബ് ആപ്പ് "
 "പ്രവർത്തിക്കുകയാണെങ്കിൽ, അത് അവസാനിപ്പിക്കും."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "തിരികെ വീട്ടിലേക്ക്"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "ഹോം സ്‌ക്രീനിലേക്ക് തിരികെ പോകണമെന്ന് തീർച്ചയാണോ? വെബ് ആപ്പ് "
 "അവസാനിപ്പിക്കും."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "പിശക്"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ഈ ഭാഷ ഇതിനകം തിരഞ്ഞെടുത്തു."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ഈ വലുപ്പം ഇതിനകം തിരഞ്ഞെടുത്തു."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ഈ രൂപം ഇതിനകം തിരഞ്ഞെടുത്തു."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ഈ ഗുണനിലവാരം ഇതിനകം തിരഞ്ഞെടുത്തു."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "വിവരം"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "പ്രോസസ്സുകളും MacOS-ലെ ആക്റ്റിവിറ്റി മോണിറ്റർ വഴി അവസാനിപ്പിക്കാം, "
 "അല്ലെങ്കിൽ അവ അവസാനിപ്പിക്കാൻ നിങ്ങളുടെ കമ്പ്യൂട്ടർ പുനരാരംഭിക്കുക."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "ശ്രദ്ധിക്കുക: വിവർത്തനം ചെയ്ത പതിപ്പ് ലൊക്കേൽസ് ഡയറക്‌ടറിയിൽ ഇല്ലെങ്കിൽ "
 "മാത്രമേ അടിസ്ഥാന ക്രോസ്‌വേഡ് ഡാറ്റ ആക്‌സസ്സുചെയ്യൂ."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,119 +239,104 @@ msgstr ""
 "ക്രോസ്വേഡ് സൃഷ്ടിക്കുന്നതിൽ ഒരു പിശക് സംഭവിച്ചു. കൂടുതൽ വിവരങ്ങൾ കൺസോളിൽ "
 "കാണുക"
 
-msgid "Easy"
-msgstr "എളുപ്പം"
-
-msgid "Medium"
-msgstr "ഇടത്തരം"
-
-msgid "Hard"
-msgstr "കഠിനം"
-
-msgid "Extreme"
-msgstr "അങ്ങേയറ്റം"
-
-msgid "Geography"
-msgstr "ഭൂമിശാസ്ത്രം"
-
-msgid "Math"
-msgstr "ഗണിതം"
-
-msgid "Science"
-msgstr "ശാസ്ത്രം"
-
-msgid "Computer Science"
-msgstr "കമ്പ്യൂട്ടർ സയൻസ്"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "തലസ്ഥാനങ്ങൾ"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ക്രോസ്വേഡ് പസിൽ - ഗെയിം"
 
-#~ msgid "Countries"
-#~ msgstr "രാജ്യങ്ങൾ"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "കുറുകേ"
 
-#~ msgid "Easy"
-#~ msgstr "എളുപ്പം"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "താഴത്ത്"
 
-#~ msgid "Medium"
-#~ msgstr "ഇടത്തരം"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "വെളിപ്പെടുത്തുക"
 
-#~ msgid "Hard"
-#~ msgstr "കഠിനം"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "കോശം"
 
-#~ msgid "Extreme"
-#~ msgstr "അങ്ങേയറ്റം"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "വാക്ക്"
 
-#~ msgid "Geography"
-#~ msgstr "ഭൂമിശാസ്ത്രം"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ഗ്രിഡ്"
 
-#~ msgid "Science"
-#~ msgstr "വലിപ്പം"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ചെക്ക്"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "ഒരു സെൽ/വാക്ക് പരിശോധിക്കുന്നതിനോ വെളിപ്പെടുത്തുന്നതിനോ, നിങ്ങൾ ആദ്യം ഒരു "
-#~ "സെൽ തിരഞ്ഞെടുക്കണം"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "വക്തമായ"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ക്രോസ്വേഡ് പസിൽ - ഗെയിം"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "സ്മാർട്ട് ഒഴിവാക്കുക"
 
-#~ msgid "Across"
-#~ msgstr "ഉടനീളം"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "സൂം ചെയ്യാൻ ക്ലിക്കുചെയ്യുക"
 
-#~ msgid "Down"
-#~ msgstr "താഴേക്ക്"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "നിങ്ങൾ കാണുന്നു"
 
-#~ msgid "Reveal"
-#~ msgstr "വെളിപ്പെടുത്തുക"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "മുതല്"
 
-#~ msgid "Cell"
-#~ msgstr "സെൽ"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "വേഡ് (കൾ) തിരുത്താൻ കഴിഞ്ഞില്ല, ക്ഷമിക്കണം."
 
-#~ msgid "Word"
-#~ msgstr "വാക്ക്"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "പദങ്ങളുടെ എണ്ണം (ക്രമീകരിച്ചു)"
 
-#~ msgid "Grid"
-#~ msgstr "ഗ്രിഡ്"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "വാക്കുകളുടെ എണ്ണം"
 
-#~ msgid "Check"
-#~ msgstr "ചെക്ക്"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "തുടരുക"
 
-#~ msgid "Clear"
-#~ msgstr "ക്ലിയർ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "നിങ്ങൾ ക്രോസ്വേഡ് പൂർത്തിയാക്കി!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "സ്മാർട്ട് ഒഴിവാക്കുക"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "സൂം ചെയ്യാൻ ക്ലിക്കുചെയ്യുക"
+msgid "Easy"
+msgstr "എളുപ്പം"
 
-#~ msgid "You are viewing"
-#~ msgstr "നിങ്ങൾ കാണുന്നു"
+msgid "Medium"
+msgstr "ഇടത്തരം"
 
-#~ msgid "from"
-#~ msgstr "നിന്ന്"
+msgid "Hard"
+msgstr "കഠിനം"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "വാക്ക്(കൾ) ചേർക്കാൻ കഴിഞ്ഞില്ല, ക്ഷമിക്കണം."
+msgid "Extreme"
+msgstr "അങ്ങേയറ്റം"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "വാക്കുകളുടെ എണ്ണം (ക്രമീകരിച്ചത്)"
+msgid "Geography"
+msgstr "ഭൂമിശാസ്ത്രം"
 
-#~ msgid "Word count"
-#~ msgstr "വാക്കുകളുടെ എണ്ണം"
+msgid "Math"
+msgstr "ഗണിതം"
 
-#~ msgid "Continue"
-#~ msgstr "തുടരുക"
+msgid "Science"
+msgstr "ശാസ്ത്രം"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "നിങ്ങൾ ക്രോസ്വേഡ് പൂർത്തിയാക്കി!"
+msgid "Computer Science"
+msgstr "കമ്പ്യൂട്ടർ സയൻസ്"
diff --git a/crossword_puzzle/locales/mn/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/mn/LC_MESSAGES/messages.mo
index 125f04f5f..4c9b75ce1 100644
Binary files a/crossword_puzzle/locales/mn/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/mn/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/mn/LC_MESSAGES/messages.po b/crossword_puzzle/locales/mn/LC_MESSAGES/messages.po
index 2a669337c..589cedadf 100644
--- a/crossword_puzzle/locales/mn/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/mn/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: mn <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Үгийн сүлжээ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Кроссворд үзэх"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Аппликешнээс гарна уу"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобал тохиргоо"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Хэлнүүд"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Хэмжээ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "гэрэл"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "харанхуй"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "систем"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Гадаад төрх"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "аймаар"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ядуу"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "дундаж тоо"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "агуу их"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "өө сэвгүй"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Кроссворд чанар"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Кроссворд хөтөч"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Буцах"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Кроссворд ачаалах"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Вэб програмыг нээх"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Вэб програмыг дуусгах"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Үг тоолох тохиргоо"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Үгийн тоог сонгоно уу"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Хамгийн их"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Захиалгат"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Энэ үйлдлийг гүйцэтгэхийн тулд та эхлээд эсийг сонгох хэрэгтэй."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Харах"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Хаах"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "хүндрэл"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Нийт үгс"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Хэцүү байдал"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Сонго"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Дахин ачааллах"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Та апп-г дахин эхлүүлэхдээ итгэлтэй байна уу?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "гарах"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Та апп-аас гарахдаа итгэлтэй байна уу? Хэрэв вэб програм ажиллаж байгаа бол "
 "энэ нь хаагдах болно."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Буцаад гэр лүүгээ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Та үндсэн дэлгэц рүү буцахдаа итгэлтэй байна уу? Вэб програмыг зогсоох "
 "болно."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Алдаа"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Энэ хэл аль хэдийн сонгогдсон байна."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Энэ хэмжээг аль хэдийн сонгосон байна."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Энэ төрхийг аль хэдийн сонгосон байна."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Энэ чанарыг аль хэдийн сонгосон байна."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Мэдээлэл"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "Зохих ёсоор дуусгавар болоогүй бүх програмын процессыг MacOS дээрх Activity "
 "Monitor ашиглан дуусгах эсвэл компьютерээ дахин эхлүүлж дуусгах боломжтой."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "ТАЙЛБАР: Суурь кроссворд өгөгдөлд зөвхөн орчуулагдсан хувилбар нь хэлний "
 "лавлахад байхгүй үед л хандана."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,117 +237,104 @@ msgstr ""
 "Кроссворд үүсгэх явцад алдаа гарлаа. Дэлгэрэнгүй мэдээллийг консол дээрээс "
 "харна уу"
 
-msgid "Easy"
-msgstr "Хялбар"
-
-msgid "Medium"
-msgstr "Дунд"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Кроссворд таавар - тоглоом"
 
-msgid "Hard"
-msgstr "Хэцүү"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Цаана"
 
-msgid "Extreme"
-msgstr "Хэт их"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Доошоо"
 
-msgid "Geography"
-msgstr "Газарзүй"
-
-msgid "Math"
-msgstr "Математик"
-
-msgid "Science"
-msgstr "Шинжлэх ухаан"
-
-msgid "Computer Science"
-msgstr "Компьютерийн шинжлэх ухаан"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Илрүүлэх"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Камера"
 
-#~ msgid "Capitals"
-#~ msgstr "Нийслэлүүд"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Үг"
 
-#~ msgid "Countries"
-#~ msgstr "Улс орнууд"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Дэвэрсэн усан"
 
-#~ msgid "Easy"
-#~ msgstr "Хялбар"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Чек"
 
-#~ msgid "Medium"
-#~ msgstr "Дунд"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Саруул"
 
-#~ msgid "Hard"
-#~ msgstr "Хэцүү"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Ухаалаг алгасах"
 
-#~ msgid "Extreme"
-#~ msgstr "Хэт их"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Томруулахын тулд дарна уу"
 
-#~ msgid "Geography"
-#~ msgstr "Газарзүй"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Та харж байна"
 
-#~ msgid "Science"
-#~ msgstr "Хэмжээ"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "аас"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Нүд/үг шалгах эсвэл илрүүлэхийн тулд та эхлээд нүдийг сонгох ёстой"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Үг (үүд) оруулах боломжгүй байна, уучлаарай."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Тоглоом"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Үгийн тоо (тохируулсан)"
 
-#~ msgid "Across"
-#~ msgstr "Даанч"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Үгийн тоо"
 
-#~ msgid "Down"
-#~ msgstr "Доош"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Ургэлжлэх"
 
-#~ msgid "Reveal"
-#~ msgstr "Илчлэх"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Та кроссворд бөглөсөн!"
 
-#~ msgid "Cell"
-#~ msgstr "Эс"
-
-#~ msgid "Word"
-#~ msgstr "Үг"
-
-#~ msgid "Grid"
-#~ msgstr "Сүлжээ"
-
-#~ msgid "Check"
-#~ msgstr "Шалгах"
-
-#~ msgid "Clear"
-#~ msgstr "Тодорхой"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Ухаалаг алгасах"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Томруулахын тулд дарна уу"
+msgid "Easy"
+msgstr "Хялбар"
 
-#~ msgid "You are viewing"
-#~ msgstr "Та үзэж байна"
+msgid "Medium"
+msgstr "Дунд"
 
-#~ msgid "from"
-#~ msgstr "-аас"
+msgid "Hard"
+msgstr "Хэцүү"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "үг(үүд) оруулж чадсангүй, уучлаарай."
+msgid "Extreme"
+msgstr "Хэт их"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Үгийн тоо (тохируулсан)"
+msgid "Geography"
+msgstr "Газарзүй"
 
-#~ msgid "Word count"
-#~ msgstr "Үгийн тоо"
+msgid "Math"
+msgstr "Математик"
 
-#~ msgid "Continue"
-#~ msgstr "Үргэлжлүүлэх"
+msgid "Science"
+msgstr "Шинжлэх ухаан"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Та кроссворд бөглөсөн!"
+msgid "Computer Science"
+msgstr "Компьютерийн шинжлэх ухаан"
diff --git a/crossword_puzzle/locales/mr/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/mr/LC_MESSAGES/messages.mo
index 1f6e3ab73..eac29c655 100644
Binary files a/crossword_puzzle/locales/mr/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/mr/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/mr/LC_MESSAGES/messages.po b/crossword_puzzle/locales/mr/LC_MESSAGES/messages.po
index 62078c85e..be65c87f1 100644
--- a/crossword_puzzle/locales/mr/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/mr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: mr <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "शब्दकोडे"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "शब्दकोडे पहा"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ॲपमधून बाहेर पडा"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "जागतिक संरचना"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "भाषा"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "आकार"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "प्रकाश"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "गडद"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "प्रणाली"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "देखावा"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "भयानक"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "गरीब"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "सरासरी"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "महान"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "परिपूर्ण"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "क्रॉसवर्ड गुणवत्ता"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "क्रॉसवर्ड ब्राउझर"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "परत जा"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "क्रॉसवर्ड लोड करा"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "वेब ॲप उघडा"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "वेब ॲप बंद करा"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "शब्द संख्या प्राधान्ये"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "शब्द संख्या निवडा"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "कमाल"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "सानुकूल"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "हे ऑपरेशन करण्यासाठी, आपण प्रथम सेल निवडणे आवश्यक आहे."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "पहा"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "बंद"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "अडचण"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "एकूण शब्द"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "अडचण"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "निवडा"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "पुन्हा सुरू करा"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "तुम्हाला खात्री आहे की तुम्ही ॲप रीस्टार्ट करू इच्छिता?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "बाहेर पडा"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "तुम्हाला खात्री आहे की तुम्ही ॲपमधून बाहेर पडू इच्छिता? वेब ॲप चालू असल्यास,"
 " ते बंद केले जाईल."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "परत घराच्या दिशेने"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "तुम्हाला खात्री आहे की तुम्ही मुख्यपृष्ठ स्क्रीनवर परत जाऊ इच्छिता? वेब ॲप "
 "बंद केले जाईल."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "त्रुटी"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ही भाषा आधीच निवडलेली आहे."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "हा आकार आधीच निवडलेला आहे."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "हा देखावा आधीच निवडलेला आहे."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ही गुणवत्ता आधीच निवडली गेली आहे."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "माहिती"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "मॉनिटरद्वारे संपुष्टात आणल्या जाऊ शकतात किंवा त्या संपुष्टात आणण्यासाठी "
 "तुमचा संगणक रीस्टार्ट करा."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,126 +230,111 @@ msgstr ""
 "क्रॉसवर्ड डेटा केवळ तेव्हाच ॲक्सेस केला जातो जेव्हा त्याची अनुवादित आवृत्ती "
 "लोकेल निर्देशिकेत नसते."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "क्रॉसवर्ड जनरेशनमध्ये एक त्रुटी आली. कृपया कन्सोलमध्ये अधिक माहिती पहा"
 
-msgid "Easy"
-msgstr "सोपे"
-
-msgid "Medium"
-msgstr "मध्यम"
-
-msgid "Hard"
-msgstr "कठिण"
-
-msgid "Extreme"
-msgstr "अत्यंत"
-
-msgid "Geography"
-msgstr "भूगोल"
-
-msgid "Math"
-msgstr "गणित"
-
-msgid "Science"
-msgstr "विज्ञान"
-
-msgid "Computer Science"
-msgstr "संगणक शास्त्र"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "कॅपिटल्स"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "क्रॉसवर्ड कोडे - खेळ"
 
-#~ msgid "Countries"
-#~ msgstr "देश"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ओलांडून"
 
-#~ msgid "Easy"
-#~ msgstr "सोपे"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "खाली"
 
-#~ msgid "Medium"
-#~ msgstr "मध्यम"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "प्रकट"
 
-#~ msgid "Hard"
-#~ msgstr "कठिण"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "सेल"
 
-#~ msgid "Extreme"
-#~ msgstr "अत्यंत"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "शब्द"
 
-#~ msgid "Geography"
-#~ msgstr "भूगोल"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ग्रीड"
 
-#~ msgid "Science"
-#~ msgstr "आकार"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "तपासा"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "सेल/शब्द तपासण्यासाठी किंवा प्रकट करण्यासाठी, तुम्ही प्रथम सेल निवडणे आवश्यक"
-#~ " आहे"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "स्पष्ट"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "क्रॉसवर्ड पझल - गेम"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "स्मार्ट स्किप"
 
-#~ msgid "Across"
-#~ msgstr "ओलांडून"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "झूम करण्यासाठी क्लिक करा"
 
-#~ msgid "Down"
-#~ msgstr "खाली"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "आपण पहात आहात"
 
-#~ msgid "Reveal"
-#~ msgstr "प्रकट करा"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "पासून"
 
-#~ msgid "Cell"
-#~ msgstr "सेल"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "क्षमस्व, शब्द घातले जाऊ शकत नाही."
 
-#~ msgid "Word"
-#~ msgstr "शब्द"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "शब्द गणना (समायोजित)"
 
-#~ msgid "Grid"
-#~ msgstr "ग्रिड"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "शब्द संख्या"
 
-#~ msgid "Check"
-#~ msgstr "तपासा"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "सुरू"
 
-#~ msgid "Clear"
-#~ msgstr "साफ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "आपण क्रॉसवर्ड पूर्ण केला!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "स्मार्ट स्किप"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "झूम करण्यासाठी क्लिक करा"
+msgid "Easy"
+msgstr "सोपे"
 
-#~ msgid "You are viewing"
-#~ msgstr "तुम्ही पहात आहात"
+msgid "Medium"
+msgstr "मध्यम"
 
-#~ msgid "from"
-#~ msgstr "पासून"
+msgid "Hard"
+msgstr "कठिण"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "शब्द टाकता आले नाहीत, क्षमस्व."
+msgid "Extreme"
+msgstr "अत्यंत"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "शब्द संख्या (समायोजित)"
+msgid "Geography"
+msgstr "भूगोल"
 
-#~ msgid "Word count"
-#~ msgstr "शब्द संख्या"
+msgid "Math"
+msgstr "गणित"
 
-#~ msgid "Continue"
-#~ msgstr "सुरू"
+msgid "Science"
+msgstr "विज्ञान"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "आपण शब्दकोड पूर्ण केले!"
+msgid "Computer Science"
+msgstr "संगणक शास्त्र"
diff --git a/crossword_puzzle/locales/ms/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ms/LC_MESSAGES/messages.mo
index c1a01106c..9b2e78a83 100644
Binary files a/crossword_puzzle/locales/ms/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ms/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ms/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ms/LC_MESSAGES/messages.po
index 06654895e..91a6f4e4a 100644
--- a/crossword_puzzle/locales/ms/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ms/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ms <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Teka silang kata"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Lihat silang kata"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Keluar dari apl"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Tetapan global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Bahasa"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Saiz"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ringan"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "gelap"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Penampilan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "dahsyat"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "miskin"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "purata"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "hebat"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "sempurna"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kualiti silang kata"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Pelayar Silang Kata"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Pergi balik"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Muatkan silang kata"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Buka apl web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Tamatkan apl web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Pilihan bilangan perkataan"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pilih bilangan perkataan"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Adat"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Untuk melaksanakan operasi ini, anda mesti memilih sel terlebih dahulu."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Lihat"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "tutup"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kesukaran"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Jumlah perkataan"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Kesukaran"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pilih"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Mula semula"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Adakah anda pasti mahu memulakan semula apl?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Keluar"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,43 +159,44 @@ msgstr ""
 "Adakah anda pasti mahu keluar dari apl? Jika apl web berjalan, ia akan "
 "ditamatkan."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Kembali ke rumah"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Adakah anda pasti mahu kembali ke skrin utama? Apl web akan ditamatkan."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ralat"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Bahasa ini sudah dipilih."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Saiz ini sudah dipilih."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Penampilan ini sudah dipilih."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kualiti ini sudah dipilih."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "Monitor Aktiviti pada MacOS, atau, hanya mulakan semula komputer anda untuk "
 "menamatkannya."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "hanya diakses apabila versi terjemahannya tidak terdapat dalam direktori "
 "tempat."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,118 +239,104 @@ msgstr ""
 "Ralat telah berlaku dalam penjanaan silang kata. Sila lihat maklumat lanjut "
 "dalam konsol"
 
-msgid "Easy"
-msgstr "Mudah"
-
-msgid "Medium"
-msgstr "Sederhana"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Teka -teki silang kata - permainan"
 
-msgid "Hard"
-msgstr "Keras"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Di seberang"
 
-msgid "Extreme"
-msgstr "melampau"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ke bawah"
 
-msgid "Geography"
-msgstr "Geografi"
-
-msgid "Math"
-msgstr "Matematik"
-
-msgid "Science"
-msgstr "Sains"
-
-msgid "Computer Science"
-msgstr "Sains Komputer"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Mendedahkan"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sel"
 
-#~ msgid "Capitals"
-#~ msgstr "modal"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Perkataan"
 
-#~ msgid "Countries"
-#~ msgstr "negara"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Mudah"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Periksa"
 
-#~ msgid "Medium"
-#~ msgstr "Sederhana"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Jelas"
 
-#~ msgid "Hard"
-#~ msgstr "Keras"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Langkau pintar"
 
-#~ msgid "Extreme"
-#~ msgstr "melampau"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klik untuk mengezum"
 
-#~ msgid "Geography"
-#~ msgstr "Geografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Anda melihat"
 
-#~ msgid "Science"
-#~ msgstr "Saiz"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "dari"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Untuk menyemak atau mendedahkan sel/perkataan, anda mesti memilih sel dahulu"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Word (s) tidak boleh dimasukkan, maaf."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Teka Silang Kata - Permainan"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kiraan perkataan (diselaraskan)"
 
-#~ msgid "Across"
-#~ msgstr "Di seberang"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Kiraan perkataan"
 
-#~ msgid "Down"
-#~ msgstr "Bawah"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Teruskan"
 
-#~ msgid "Reveal"
-#~ msgstr "Dedahkan"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Anda menyelesaikan silang kata!"
 
-#~ msgid "Cell"
-#~ msgstr "sel"
-
-#~ msgid "Word"
-#~ msgstr "Perkataan"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Semak"
-
-#~ msgid "Clear"
-#~ msgstr "Jelas"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Langkau pintar"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klik untuk mengezum"
+msgid "Easy"
+msgstr "Mudah"
 
-#~ msgid "You are viewing"
-#~ msgstr "Anda sedang melihat"
+msgid "Medium"
+msgstr "Sederhana"
 
-#~ msgid "from"
-#~ msgstr "daripada"
+msgid "Hard"
+msgstr "Keras"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "perkataan tidak dapat disisipkan, maaf."
+msgid "Extreme"
+msgstr "melampau"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Bilangan perkataan (dilaraskan)"
+msgid "Geography"
+msgstr "Geografi"
 
-#~ msgid "Word count"
-#~ msgstr "Bilangan perkataan"
+msgid "Math"
+msgstr "Matematik"
 
-#~ msgid "Continue"
-#~ msgstr "teruskan"
+msgid "Science"
+msgstr "Sains"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Anda melengkapkan silang kata!"
+msgid "Computer Science"
+msgstr "Sains Komputer"
diff --git a/crossword_puzzle/locales/mt/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/mt/LC_MESSAGES/messages.mo
index ec3125b46..2bb3b3437 100644
Binary files a/crossword_puzzle/locales/mt/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/mt/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/mt/LC_MESSAGES/messages.po b/crossword_puzzle/locales/mt/LC_MESSAGES/messages.po
index ca290214b..72b126d06 100644
--- a/crossword_puzzle/locales/mt/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/mt/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: mt <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>=1 && n%100<=10) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Tisliba"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Ara tisliba"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ħruġ mill-app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Settings Globali"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Lingwi"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Daqs"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "dawl"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "skur"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Dehra"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "terribbli"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "fqir"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "medja"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Kbira"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfetta"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kwalità tat-tisliba"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Tisliba Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Mur lura"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Tagħbija tisliba"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Iftaħ l-app tal-web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Ittemm l-app tal-web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferenzi tal-għadd tal-kliem"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Agħżel l-għadd tal-kliem"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Massimu"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Biex twettaq din l-operazzjoni, l-ewwel trid tagħżel ċellola."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Ara"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Agħlaq"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "diffikultà"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Kliem totali"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Diffikultà"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Agħżel"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Erġa ibda"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Int żgur li trid terġa' tibda l-app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ħruġ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Int żgur li trid toħroġ mill-app? Jekk l-app tal-web tkun qed taħdem, tiġi "
 "mitmuma."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Lura d-dar"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Int żgur li trid tmur lura għall-iskrin tad-dar? Il-web app se tiġi mitmuma."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Żball"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Din il-lingwa hija diġà magħżula."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Dan id-daqs huwa diġà magħżul."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Din id-dehra hija diġà magħżula."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Din il-kwalità hija diġà magħżula."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "Attività fuq MacOS, jew, sempliċement ibda mill-ġdid il-kompjuter tiegħek "
 "biex ittemmhom."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "cwords. NOTA: Data tisliba bażi hija aċċessata biss meta l-verżjoni tradotta"
 " tagħha ma tkunx preżenti fid-direttorju lokali."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,117 +238,104 @@ msgstr ""
 "Sar żball fil-ġenerazzjoni tat-tisliba. Jekk jogħġbok ara aktar "
 "informazzjoni fil-console"
 
-msgid "Easy"
-msgstr "Faċli"
-
-msgid "Medium"
-msgstr "Medju"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle Crossword - Logħba"
 
-msgid "Hard"
-msgstr "Iebsa"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Madwar"
 
-msgid "Extreme"
-msgstr "Estremi"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "'L isfel"
 
-msgid "Geography"
-msgstr "Ġeografija"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Xjenza"
-
-msgid "Computer Science"
-msgstr "Xjenza tal-kompjuter"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Jiżvelaw"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ċellula"
 
-#~ msgid "Capitals"
-#~ msgstr "Kapitali"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Kelma"
 
-#~ msgid "Countries"
-#~ msgstr "Pajjiżi"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grilja"
 
-#~ msgid "Easy"
-#~ msgstr "Faċli"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Iċċekkja"
 
-#~ msgid "Medium"
-#~ msgstr "Medju"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Ċar"
 
-#~ msgid "Hard"
-#~ msgstr "Iebsa"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Skip intelliġenti"
 
-#~ msgid "Extreme"
-#~ msgstr "Estremi"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Ikklikkja biex zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Ġeografija"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Qed tara"
 
-#~ msgid "Science"
-#~ msgstr "Daqs"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "minn"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Biex tiċċekkja jew tikxef ċellula/kelma, l-ewwel trid tagħżel ċellula"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Kelma (i) ma setgħetx tiddaħħal, jiddispjaċini."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Tisliba - Logħba"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Għadd tal-Kelma (Aġġustat)"
 
-#~ msgid "Across"
-#~ msgstr "Madwar"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Għadd tal-kliem"
 
-#~ msgid "Down"
-#~ msgstr "Down"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Kompli"
 
-#~ msgid "Reveal"
-#~ msgstr "Ikxef"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Int imlejt it-tisliba!"
 
-#~ msgid "Cell"
-#~ msgstr "Ċellula"
-
-#~ msgid "Word"
-#~ msgstr "Kelma"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Iċċekkja"
-
-#~ msgid "Clear"
-#~ msgstr "Ċara"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Skip intelliġenti"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Ikklikkja biex zoom"
+msgid "Easy"
+msgstr "Faċli"
 
-#~ msgid "You are viewing"
-#~ msgstr "Qed tara"
+msgid "Medium"
+msgstr "Medju"
 
-#~ msgid "from"
-#~ msgstr "minn"
+msgid "Hard"
+msgstr "Iebsa"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "kelma(i) ma setgħetx tiddaħħal, sorry."
+msgid "Extreme"
+msgstr "Estremi"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Għadd ta' kliem (aġġustat)"
+msgid "Geography"
+msgstr "Ġeografija"
 
-#~ msgid "Word count"
-#~ msgstr "Għadd tal-kliem"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Kompli"
+msgid "Science"
+msgstr "Xjenza"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Imlejt it-tisliba!"
+msgid "Computer Science"
+msgstr "Xjenza tal-kompjuter"
diff --git a/crossword_puzzle/locales/my/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/my/LC_MESSAGES/messages.mo
index 2579be3eb..3f988e3cd 100644
Binary files a/crossword_puzzle/locales/my/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/my/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/my/LC_MESSAGES/messages.po b/crossword_puzzle/locales/my/LC_MESSAGES/messages.po
index efb5c3dd0..0aaf345fc 100644
--- a/crossword_puzzle/locales/my/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/my/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: my <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword ပဟေဋ္ဌိ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "စကားဝှက်များကိုကြည့်ပါ။"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "အက်ပ်မှထွက်ပါ။"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ကမ္ဘာလုံးဆိုင်ရာ ဆက်တင်များ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ဘာသာစကားများ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "အရွယ်အစား"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "အလင်း"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "မှောငျမိုကျသော"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "စနစ်"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "အသွင်အပြင်"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ကေြာက်လန့်ဘွယ်သော"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ဆင်းရဲသော"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ပျမ်းမှျမှု"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ကြီးမားသော"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "စုံလင်သော"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "စကားလုံးအရည်အသွေး"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ပြန်သွားသည်"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "စကားဝှက်ကို တင်ပါ။"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ဝဘ်အက်ပ်ကိုဖွင့်ပါ။"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ဝဘ်အက်ပ်ကို ပိတ်ပါ။"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "စကားလုံးရေတွက်မှု ဦးစားပေး"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "စကားလုံးအရေအတွက်ကို ရွေးပါ။"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "အများဆုံး"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "စိတ်ကြိုက်"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ဒီစစ်ဆင်ရေးကိုလုပ်ဆောင်ရန်သင်ပထမ ဦး ဆုံးဆဲလ်ကိုရွေးချယ်ရမည်။"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "အမြင်"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ပိတ်လိုက်"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "အခက်အခဲ"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "စုစုပေါင်းစကားလုံးများ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "အခက်အခဲ"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ရွေးချယ်ပါ။"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "ပြန်စတင်သည်"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "အက်ပ်ကို ပြန်လည်စတင်လိုသည်မှာ သေချာပါသလား။"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ထွက်ပေါက်"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,42 +158,43 @@ msgstr ""
 "အက်ပ်မှ ထွက်လိုသည်မှာ သေချာပါသလား။ ဝဘ်အက်ပ်ကို အသုံးပြုနေပါက ၎င်းကို "
 "ရပ်စဲသွားမည်ဖြစ်သည်။"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "အိမ်ပြန်"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "ပင်မစခရင်သို့ ပြန်သွားလိုသည်မှာ သေချာပါသလား။ ဝဘ်အက်ပ်ကို ရပ်စဲပါမည်။"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "အမှား"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ဤဘာသာစကားကို ရွေးထားပြီးဖြစ်သည်။"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ဤအရွယ်အစားကို ရွေးထားပြီးဖြစ်သည်။"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ဤအသွင်အပြင်ကို ရွေးထားပြီးဖြစ်သည်။"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ဒီအရည်အသွေးကိုရွေးချယ်ပြီးဖြစ်သည်။"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "အချက်အလက်"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "ပိတ်ပစ်နိုင်သည် သို့မဟုတ် ၎င်းတို့ကို ရပ်တန့်ရန်အတွက် သင့်ကွန်ပျူတာကို "
 "ပြန်လည်စတင်ပါ။"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "ဒေသန္တရလမ်းညွှန်တွင် မတွေ့ရသောအခါတွင်သာ အခြေခံစကားဝှက်ဒေတာကို "
 "ဝင်ရောက်ကြည့်ရှုနိုင်မည်ဖြစ်သည်။"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "စကားဝှက်မျိုးဆက်တွင် အမှားအယွင်းတစ်ခု ဖြစ်ပေါ်ခဲ့သည်။ ကျေးဇူးပြု၍ "
 "ကွန်ဆိုးလ်တွင် နောက်ထပ်အချက်အလက်များကို ကြည့်ပါ။"
 
-msgid "Easy"
-msgstr "လွယ်ပါတယ်။"
-
-msgid "Medium"
-msgstr "အလယ်အလတ်"
-
-msgid "Hard"
-msgstr "ခက်တယ်။"
-
-msgid "Extreme"
-msgstr "အလွန်အမင်း"
-
-msgid "Geography"
-msgstr "ပထဝီဝင်"
-
-msgid "Math"
-msgstr "သင်္ချာ"
-
-msgid "Science"
-msgstr "သိပ္ပံ"
-
-msgid "Computer Science"
-msgstr "ကွန်ပျူတာသိပ္ပံ"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "မြို့တော်များ"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "စကားလုံးပဟေ uzzle - ဂိမ်း"
 
-#~ msgid "Countries"
-#~ msgstr "နိုင်ငံတွေ"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ဖြတ်."
 
-#~ msgid "Easy"
-#~ msgstr "လွယ်ပါတယ်။"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ဆင်းလျက်"
 
-#~ msgid "Medium"
-#~ msgstr "အလယ်အလတ်"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "ထုတ်ဖေါ်"
 
-#~ msgid "Hard"
-#~ msgstr "ခက်တယ်။"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ထောင်ခန်း"
 
-#~ msgid "Extreme"
-#~ msgstr "အလွန်အမင်း"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "စကားလုံး"
 
-#~ msgid "Geography"
-#~ msgstr "ပထဝီဝင်"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ဝက်grи"
 
-#~ msgid "Science"
-#~ msgstr "အရွယ်အစား"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "စစ်ဆေး"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "ဆဲလ်/စကားလုံးတစ်လုံးကို စစ်ဆေးရန် သို့မဟုတ် ဖော်ထုတ်ရန်၊ သင်သည် ဆဲလ်တစ်ခုကို"
-#~ " ဦးစွာရွေးချယ်ရပါမည်။"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ရှင်းလင်းသော"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - ဂိမ်း"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "စမတ် skip skip"
 
-#~ msgid "Across"
-#~ msgstr "တစ်ဖက်မှာ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ချဲ့ရန်နှိပ်ပါ"
 
-#~ msgid "Down"
-#~ msgstr "ဆင်းတယ်။"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "သင်ကြည့်နေပါတယ်"
 
-#~ msgid "Reveal"
-#~ msgstr "ထုတ်ဖေါ်"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "မှ"
 
-#~ msgid "Cell"
-#~ msgstr "ဆဲလ်"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "စကားလုံး (များ) ကိုမထည့်နိုင်ပါ, စိတ်မကောင်းပါ။"
 
-#~ msgid "Word"
-#~ msgstr "စကားလုံး"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "စကားလုံးအရေအတွက် (ချိန်ညှိ)"
 
-#~ msgid "Grid"
-#~ msgstr "ဂရစ်"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "စကားလုံးအရေအတွက်"
 
-#~ msgid "Check"
-#~ msgstr "စစ်ဆေးပါ။"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ဆက်လက်"
 
-#~ msgid "Clear"
-#~ msgstr "ရှင်းလင်းသော"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "သငျသညျစကားလုံးကိုဖြည့်ပြီး!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "စမတ် skip skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ချဲ့ရန်နှိပ်ပါ"
+msgid "Easy"
+msgstr "လွယ်ပါတယ်။"
 
-#~ msgid "You are viewing"
-#~ msgstr "မင်းကြည့်နေတယ်။"
+msgid "Medium"
+msgstr "အလယ်အလတ်"
 
-#~ msgid "from"
-#~ msgstr "ထံမှ"
+msgid "Hard"
+msgstr "ခက်တယ်။"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "စကားလုံး(များ) မထည့်နိုင်ခဲ့ပါ။ တောင်းပန်ပါတယ်။"
+msgid "Extreme"
+msgstr "အလွန်အမင်း"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "စကားလုံးအရေအတွက် (ချိန်ညှိထားသည်)"
+msgid "Geography"
+msgstr "ပထဝီဝင်"
 
-#~ msgid "Word count"
-#~ msgstr "စကားလုံးအရေအတွက်"
+msgid "Math"
+msgstr "သင်္ချာ"
 
-#~ msgid "Continue"
-#~ msgstr "ဆက်လက်"
+msgid "Science"
+msgstr "သိပ္ပံ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "သင်သည် စကားဝှက်ကို ပြီးမြောက်ခဲ့သည်။"
+msgid "Computer Science"
+msgstr "ကွန်ပျူတာသိပ္ပံ"
diff --git a/crossword_puzzle/locales/ne/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ne/LC_MESSAGES/messages.mo
index 04951a88d..0bfc063d4 100644
Binary files a/crossword_puzzle/locales/ne/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ne/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ne/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ne/LC_MESSAGES/messages.po
index ee5e08988..aa6a50319 100644
--- a/crossword_puzzle/locales/ne/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ne/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ne <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "क्रसवर्ड पजल"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "क्रसवर्डहरू हेर्नुहोस्"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "एपबाट बाहिर निस्कनुहोस्"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ग्लोबल सेटिङहरू"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "भाषाहरु"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "साइज"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "प्रकाश"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "अँध्यारो"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "प्रणाली"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "उपस्थिति"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "भयानक"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "गरिब"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "औसत"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ठूलो"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "पूर्ण"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "क्रसवर्ड को गुणस्तर"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "क्रसवर्ड ब्राउजर"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "पछाडी जाउ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "क्रसवर्ड लोड गर्नुहोस्"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "वेब एप खोल्नुहोस्"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "वेब एप बन्द गर्नुहोस्"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "शब्द गणना प्राथमिकताहरू"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "शब्द गणना चयन गर्नुहोस्"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "अधिकतम"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "अनुकूलन"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "यो अपरेशन प्रदर्शन गर्न, तपाईंले पहिले एउटा सेल चयन गर्नुपर्नेछ।"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "हेर्नुहोस्"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "बन्द गर्नुहोस्"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "कठिनाई"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "कुल शब्दहरू"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "कठिनाई"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "चयन गर्नुहोस्"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "फेरि शुरु गर्नु"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "के तपाइँ एप पुन: सुरु गर्न निश्चित हुनुहुन्छ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "बाहिर निस्कनुहोस्"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "के तपाइँ एपबाट बाहिर निस्कन निश्चित हुनुहुन्छ? यदि वेब एप चलिरहेको छ भने, यो"
 " समाप्त हुनेछ।"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "घर फिर्ता"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "के तपाईं निश्चित रूपमा गृह स्क्रिनमा फर्कन चाहनुहुन्छ? वेब एप खारेज गरिनेछ।"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "त्रुटि"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "यो भाषा पहिले नै चयन गरिएको छ।"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "यो आकार पहिले नै चयन गरिएको छ।"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "यो उपस्थिति पहिले नै चयन गरिएको छ।"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "यो गुण पहिले नै चयन गरिएको छ।"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "जानकारी"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "राम्ररी समाप्त नगरिएका छन् MacOS मा गतिविधि मनिटर मार्फत समाप्त गर्न सकिन्छ,"
 " वा, तिनीहरूलाई समाप्त गर्नको लागि तपाइँको कम्प्युटर पुन: सुरु गर्नुहोस्।"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,123 +229,110 @@ msgstr ""
 "मात्र पहुँच गरिन्छ जब यसको अनुवादित संस्करण लोकेल डाइरेक्टरीमा उपस्थित "
 "हुँदैन।"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "क्रसवर्ड उत्पादनमा त्रुटि भयो। कृपया कन्सोलमा थप जानकारी हेर्नुहोस्"
 
-msgid "Easy"
-msgstr "सजिलो"
-
-msgid "Medium"
-msgstr "मध्यम"
-
-msgid "Hard"
-msgstr "कडा"
-
-msgid "Extreme"
-msgstr "चरम"
-
-msgid "Geography"
-msgstr "भूगोल"
-
-msgid "Math"
-msgstr "गणित"
-
-msgid "Science"
-msgstr "विज्ञान"
-
-msgid "Computer Science"
-msgstr "कम्प्युटर विज्ञान"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "राजधानीहरू"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "क्रसवर्ड पजल - खेल"
 
-#~ msgid "Countries"
-#~ msgstr "देशहरू"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "वारपार"
 
-#~ msgid "Easy"
-#~ msgstr "सजिलो"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "तल"
 
-#~ msgid "Medium"
-#~ msgstr "मध्यम"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "प्रकट गर्नु"
 
-#~ msgid "Hard"
-#~ msgstr "कडा"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "कोशाणु"
 
-#~ msgid "Extreme"
-#~ msgstr "चरम"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "शब्द"
 
-#~ msgid "Geography"
-#~ msgstr "भूगोल"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ग्रिड"
 
-#~ msgid "Science"
-#~ msgstr "साइज"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "नियन्त्रण"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "सेल/शब्द जाँच्न वा प्रकट गर्न, तपाईंले पहिले सेल चयन गर्नुपर्छ"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "स्पष्ट"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "क्रसवर्ड पजल - खेल"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "स्मार्ट स्किप"
 
-#~ msgid "Across"
-#~ msgstr "पार"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "जुम गर्न क्लिक गर्नुहोस्"
 
-#~ msgid "Down"
-#~ msgstr "तल"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "तपाईं अवलोकन गर्दै हुनुहुन्छ"
 
-#~ msgid "Reveal"
-#~ msgstr "प्रकट गर्नुहोस्"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "देखि"
 
-#~ msgid "Cell"
-#~ msgstr "सेल"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "शब्द (हरू) सम्मिलित हुन सकेन, माफ गर्नुहोस्।"
 
-#~ msgid "Word"
-#~ msgstr "शब्द"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "शब्द गणना (समायोजित)"
 
-#~ msgid "Grid"
-#~ msgstr "ग्रिड"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "शब्द गणना"
 
-#~ msgid "Check"
-#~ msgstr "जाँच गर्नुहोस्"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "जारी राख्नु"
 
-#~ msgid "Clear"
-#~ msgstr "खाली गर्नुहोस्"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "तपाईंले क्रसवर्ड पूरा गर्नुभयो!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "स्मार्ट स्किप"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "जुम गर्न क्लिक गर्नुहोस्"
+msgid "Easy"
+msgstr "सजिलो"
 
-#~ msgid "You are viewing"
-#~ msgstr "तपाई हेर्दै हुनुहुन्छ"
+msgid "Medium"
+msgstr "मध्यम"
 
-#~ msgid "from"
-#~ msgstr "बाट"
+msgid "Hard"
+msgstr "कडा"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "शब्द(हरू) सम्मिलित गर्न सकिएन, माफ गर्नुहोस्।"
+msgid "Extreme"
+msgstr "चरम"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "शब्द गणना (समायोजित)"
+msgid "Geography"
+msgstr "भूगोल"
 
-#~ msgid "Word count"
-#~ msgstr "शब्द गणना"
+msgid "Math"
+msgstr "गणित"
 
-#~ msgid "Continue"
-#~ msgstr "जारी राख्नुहोस्"
+msgid "Science"
+msgstr "विज्ञान"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "तपाईंले क्रसवर्ड पूरा गर्नुभयो!"
+msgid "Computer Science"
+msgstr "कम्प्युटर विज्ञान"
diff --git a/crossword_puzzle/locales/nl/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/nl/LC_MESSAGES/messages.mo
index 17e655470..7288b864e 100644
Binary files a/crossword_puzzle/locales/nl/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/nl/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/nl/LC_MESSAGES/messages.po b/crossword_puzzle/locales/nl/LC_MESSAGES/messages.po
index 07b2eca1d..913a757bb 100644
--- a/crossword_puzzle/locales/nl/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/nl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: nl <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kruiswoord puzzel"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Kruiswoordraadsels bekijken"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Sluit de app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Algemene instellingen"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Talen"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Maat"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "licht"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "donker"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "systeem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Verschijning"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "vreselijk"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "arm"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "gemiddeld"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Geweldig"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfect"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kruiswoordraadselkwaliteit"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Kruiswoordraadselbrowser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Ga terug"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Kruiswoordraadsel laden"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Web-app openen"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Web-app beëindigen"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Voorkeuren voor het aantal woorden"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Selecteer het aantal woorden"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximaal"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Aangepast"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Om deze bewerking uit te voeren, moet u eerst een cel selecteren."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Weergave"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Dichtbij"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "moeilijkheid"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Totaal woorden"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Moeilijkheidsgraad"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Selecteer"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Herstarten"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Weet u zeker dat u de app opnieuw wilt starten?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Uitgang"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Weet u zeker dat u de app wilt afsluiten? Als de web-app actief is, wordt "
 "deze beëindigd."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Terug naar huis"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Weet je zeker dat je terug wilt naar het startscherm? De webapp wordt "
 "beëindigd."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Fout"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Deze taal is al geselecteerd."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Deze maat is al geselecteerd."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Deze verschijning is al geselecteerd."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Deze kwaliteit is al geselecteerd."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "kunnen worden beëindigd via Activity Monitor op MacOS, of u kunt "
 "eenvoudigweg uw computer opnieuw opstarten om ze te beëindigen."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "toegankelijk als de vertaalde versie ervan niet aanwezig is in de map met "
 "landinstellingen."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Er is een fout opgetreden bij het genereren van kruiswoordraadsels. Zie meer"
 " informatie in de console"
 
-msgid "Easy"
-msgstr "Eenvoudig"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword puzzel - spel"
 
-msgid "Hard"
-msgstr "Moeilijk"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Over"
 
-msgid "Extreme"
-msgstr "Extreem"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Omlaag"
 
-msgid "Geography"
-msgstr "Geografie"
-
-msgid "Math"
-msgstr "Wiskunde"
-
-msgid "Science"
-msgstr "Wetenschap"
-
-msgid "Computer Science"
-msgstr "Computertechnologie"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Onthullen"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cel"
 
-#~ msgid "Capitals"
-#~ msgstr "Hoofdsteden"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Woord"
 
-#~ msgid "Countries"
-#~ msgstr "Landen"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rooster"
 
-#~ msgid "Easy"
-#~ msgstr "Eenvoudig"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Rekening"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Duidelijk"
 
-#~ msgid "Hard"
-#~ msgstr "Moeilijk"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Slim Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Extreem"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klik om te zoomen"
 
-#~ msgid "Geography"
-#~ msgstr "Geografie"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "U kijkt"
 
-#~ msgid "Science"
-#~ msgstr "Maat"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "van"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Om een cel/woord te controleren of zichtbaar te maken, moet u eerst een cel "
-#~ "selecteren"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Woord (s) konden niet worden ingevoegd, sorry."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Kruiswoordraadsel - Spel"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Woordtelling (aangepast)"
 
-#~ msgid "Across"
-#~ msgstr "Over"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Aantal woorden"
 
-#~ msgid "Down"
-#~ msgstr "Omlaag"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Doorgaan"
 
-#~ msgid "Reveal"
-#~ msgstr "Onthullen"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "U hebt het kruiswoordraadsel voltooid!"
 
-#~ msgid "Cell"
-#~ msgstr "Cel"
-
-#~ msgid "Word"
-#~ msgstr "Woord"
-
-#~ msgid "Grid"
-#~ msgstr "Rooster"
-
-#~ msgid "Check"
-#~ msgstr "Rekening"
-
-#~ msgid "Clear"
-#~ msgstr "Duidelijk"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Slim Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klik om te zoomen"
+msgid "Easy"
+msgstr "Eenvoudig"
 
-#~ msgid "You are viewing"
-#~ msgstr "Je bekijkt"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "van"
+msgid "Hard"
+msgstr "Moeilijk"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "woord(en) konden niet worden ingevoegd, sorry."
+msgid "Extreme"
+msgstr "Extreem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Aantal woorden (aangepast)"
+msgid "Geography"
+msgstr "Geografie"
 
-#~ msgid "Word count"
-#~ msgstr "Aantal woorden"
+msgid "Math"
+msgstr "Wiskunde"
 
-#~ msgid "Continue"
-#~ msgstr "Doorgaan"
+msgid "Science"
+msgstr "Wetenschap"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Je hebt het kruiswoordraadsel voltooid!"
+msgid "Computer Science"
+msgstr "Computertechnologie"
diff --git a/crossword_puzzle/locales/no/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/no/LC_MESSAGES/messages.mo
index ff8877fde..405b29772 100644
Binary files a/crossword_puzzle/locales/no/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/no/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/no/LC_MESSAGES/messages.po b/crossword_puzzle/locales/no/LC_MESSAGES/messages.po
index 2a2f37559..6f0e72d4c 100644
--- a/crossword_puzzle/locales/no/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/no/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: no <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Kryssord"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Se kryssord"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Avslutt appen"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globale innstillinger"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Språk"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Størrelse"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "lys"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mørk"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "system"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Utseende"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "fryktelig"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "dårlig"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "gjennomsnitt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "flott"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfekt"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kryssordkvalitet"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Kryssordleser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Gå tilbake"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Last inn kryssord"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Åpne nettappen"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Avslutt web-appen"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferanser for antall ord"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Velg antall ord"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "For å utføre denne operasjonen, må du først velge en celle."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Utsikt"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Lukk"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "vanskelighet"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Totalt antall ord"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Vanskelighet"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Plukke ut"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Omstart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Er du sikker på at du vil starte appen på nytt?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Exit"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Er du sikker på at du vil avslutte appen? Hvis nettappen kjører, vil den bli"
 " avsluttet."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Tilbake til hjemmet"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Er du sikker på at du vil gå tilbake til startskjermen? Nettappen vil bli "
 "avsluttet."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Feil"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Dette språket er allerede valgt."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Denne størrelsen er allerede valgt."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Dette utseendet er allerede valgt."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Denne kvaliteten er allerede valgt."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "Alle appprosesser som ikke er riktig avsluttet kan avsluttes via Activity "
 "Monitor på MacOS, eller bare start datamaskinen på nytt for å avslutte dem."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "Basiskryssorddata er bare tilgjengelig når den oversatte versjonen ikke "
 "finnes i lokalitetskatalogen."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,117 +237,104 @@ msgstr ""
 "Det oppstod en feil under generering av kryssord. Vennligst se mer "
 "informasjon i konsollen"
 
-msgid "Easy"
-msgstr "Lett"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Kryssord - spill"
 
-msgid "Hard"
-msgstr "Hard"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "På tvers"
 
-msgid "Extreme"
-msgstr "Ekstrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ned"
 
-msgid "Geography"
-msgstr "Geografi"
-
-msgid "Math"
-msgstr "Matte"
-
-msgid "Science"
-msgstr "Vitenskap"
-
-msgid "Computer Science"
-msgstr "Datavitenskap"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Avsløre"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Celle"
 
-#~ msgid "Capitals"
-#~ msgstr "Kapitaler"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Ord"
 
-#~ msgid "Countries"
-#~ msgstr "Land"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Nett"
 
-#~ msgid "Easy"
-#~ msgstr "Lett"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kryss av"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Klar"
 
-#~ msgid "Hard"
-#~ msgstr "Hard"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart hopp"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klikk for å zoome"
 
-#~ msgid "Geography"
-#~ msgstr "Geografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Du ser på"
 
-#~ msgid "Science"
-#~ msgstr "Størrelse"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "fra"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "For å sjekke eller avsløre en celle/ord, må du først velge en celle"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ord (er) kunne ikke settes inn, beklager."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Kryssord - Spill"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Ordtelling (justert)"
 
-#~ msgid "Across"
-#~ msgstr "På tvers"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Ordtelling"
 
-#~ msgid "Down"
-#~ msgstr "Ned"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Fortsette"
 
-#~ msgid "Reveal"
-#~ msgstr "Avsløre"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Du fullførte kryssordet!"
 
-#~ msgid "Cell"
-#~ msgstr "Celle"
-
-#~ msgid "Word"
-#~ msgstr "Ord"
-
-#~ msgid "Grid"
-#~ msgstr "Nett"
-
-#~ msgid "Check"
-#~ msgstr "Kryss av"
-
-#~ msgid "Clear"
-#~ msgstr "Klar"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart hopp"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klikk for å zoome"
+msgid "Easy"
+msgstr "Lett"
 
-#~ msgid "You are viewing"
-#~ msgstr "Du ser på"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "fra"
+msgid "Hard"
+msgstr "Hard"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ord(e) kunne ikke settes inn, beklager."
+msgid "Extreme"
+msgstr "Ekstrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Antall ord (justert)"
+msgid "Geography"
+msgstr "Geografi"
 
-#~ msgid "Word count"
-#~ msgstr "Ordtelling"
+msgid "Math"
+msgstr "Matte"
 
-#~ msgid "Continue"
-#~ msgstr "Fortsette"
+msgid "Science"
+msgstr "Vitenskap"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Du fullførte kryssordet!"
+msgid "Computer Science"
+msgstr "Datavitenskap"
diff --git a/crossword_puzzle/locales/ny/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ny/LC_MESSAGES/messages.mo
index c94f31e6e..2712a6876 100644
Binary files a/crossword_puzzle/locales/ny/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ny/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ny/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ny/LC_MESSAGES/messages.po
index 84e750cf3..c75bdef85 100644
--- a/crossword_puzzle/locales/ny/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ny/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ny <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Onani mawu ophatikizika"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Chokani pulogalamuyi"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Zokonda Padziko Lonse"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Zinenero"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Kukula"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "kuwala"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mdima"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "dongosolo"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Maonekedwe"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "zoophya"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "wosauka"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "wapakati"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "wankulu"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "panga bwino"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "CRAMEHERUE MTIMA"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Bwererani"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Kwezani mawu opingasa"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Tsegulani pulogalamu yapaintaneti"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Chotsani pulogalamu yapaintaneti"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Zokonda zowerengera mawu"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Sankhani kuchuluka kwa mawu"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Kuchuluka"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Mwambo"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Kuti mugwire ntchito iyi, muyenera kusankha foni."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Onani"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Tsekani"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "zovuta"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Mawu onse"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Zovuta"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Sankhani"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Yambitsaninso"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Kodi mukutsimikiza kuti mukufuna kuyambitsanso pulogalamuyi?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Potulukira"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Kodi mukutsimikiza kuti mukufuna kutuluka mu pulogalamuyi? Ngati pulogalamu "
 "yapaintaneti ikugwira ntchito, idzathetsedwa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Kubwerera kunyumba"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Kodi mukutsimikiza kuti mukufuna kubwereranso ku sikirini yakunyumba? "
 "Pulogalamu yapaintaneti idzathetsedwa."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Cholakwika"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Chilankhulochi chasankhidwa kale."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Kukula uku kwasankhidwa kale."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Maonekedwe awa asankhidwa kale."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Izi zimasankhidwa kale."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Zambiri"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "sizinathetsedwe bwino zitha kuthetsedwa kudzera mu Activity Monitor pa "
 "MacOS, kapena, ingoyambitsaninso kompyuta yanu kuti muyimitse."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "Zambiri za mawu oyambira zimafikiridwa pokhapokha ngati zomasulira zake "
 "palibe m'ndandanda wamalo."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,117 +238,104 @@ msgstr ""
 "Panali cholakwika popanga mawu osiyanasiyana. Chonde onani zambiri mu "
 "console"
 
-msgid "Easy"
-msgstr "Zosavuta"
-
-msgid "Medium"
-msgstr "Wapakati"
-
-msgid "Hard"
-msgstr "Zovuta"
-
-msgid "Extreme"
-msgstr "Kwambiri"
-
-msgid "Geography"
-msgstr "Geography"
-
-msgid "Math"
-msgstr "Masamu"
-
-msgid "Science"
-msgstr "Sayansi"
-
-msgid "Computer Science"
-msgstr "Sayansi ya kompyuta"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Malikulu"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Masewera a Crossword - Masewera"
 
-#~ msgid "Countries"
-#~ msgstr "Mayiko"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Uko"
 
-#~ msgid "Easy"
-#~ msgstr "Zosavuta"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Pansi"
 
-#~ msgid "Medium"
-#~ msgstr "Wapakati"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ulula"
 
-#~ msgid "Hard"
-#~ msgstr "Zovuta"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Mokhala"
 
-#~ msgid "Extreme"
-#~ msgstr "Kwambiri"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Liu"
 
-#~ msgid "Geography"
-#~ msgstr "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Gululi"
 
-#~ msgid "Science"
-#~ msgstr "Kukula"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kufufuza"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Kuti muwone kapena kuwulula selo/mawu, muyenera kusankha kaye selo"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Koyera"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Masewera"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Pip"
 
-#~ msgid "Across"
-#~ msgstr "Kudutsa"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Dinani ku Zoom"
 
-#~ msgid "Down"
-#~ msgstr "Pansi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Mukuwona"
 
-#~ msgid "Reveal"
-#~ msgstr "Vumbulutsa"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "kuchokera"
 
-#~ msgid "Cell"
-#~ msgstr "Selo"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Mawu (s) sakanakhoza kuyikidwa, pepani."
 
-#~ msgid "Word"
-#~ msgstr "Mawu"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kuwerengera mawu (kusinthidwa)"
 
-#~ msgid "Grid"
-#~ msgstr "Gridi"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Kuwerengera Mawu"
 
-#~ msgid "Check"
-#~ msgstr "Onani"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Pitiliza"
 
-#~ msgid "Clear"
-#~ msgstr "Zomveka"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Munamaliza mawu oyambira!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Pip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Dinani ku Zoom"
+msgid "Easy"
+msgstr "Zosavuta"
 
-#~ msgid "You are viewing"
-#~ msgstr "Mukuwona"
+msgid "Medium"
+msgstr "Wapakati"
 
-#~ msgid "from"
-#~ msgstr "kuchokera"
+msgid "Hard"
+msgstr "Zovuta"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "mawu(ma) sanayikidwe, pepani."
+msgid "Extreme"
+msgstr "Kwambiri"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Chiwerengero cha mawu (chosinthidwa)"
+msgid "Geography"
+msgstr "Geography"
 
-#~ msgid "Word count"
-#~ msgstr "Chiwerengero cha mawu"
+msgid "Math"
+msgstr "Masamu"
 
-#~ msgid "Continue"
-#~ msgstr "Pitirizani"
+msgid "Science"
+msgstr "Sayansi"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Mwamaliza mawu ophatikizika!"
+msgid "Computer Science"
+msgstr "Sayansi ya kompyuta"
diff --git a/crossword_puzzle/locales/or/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/or/LC_MESSAGES/messages.mo
index f673f2611..38c9aba7d 100644
Binary files a/crossword_puzzle/locales/or/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/or/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/or/LC_MESSAGES/messages.po b/crossword_puzzle/locales/or/LC_MESSAGES/messages.po
index 7378f1046..af1c3948f 100644
--- a/crossword_puzzle/locales/or/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/or/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: or <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "କ୍ରସ୍ ୱାର୍ଡ ପଜଲ୍ |"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "କ୍ରସ୍ ୱାର୍ଡଗୁଡିକ ଦେଖନ୍ତୁ |"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ଆପ୍ ଛାଡନ୍ତୁ |"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ଗ୍ଲୋବାଲ୍ ସେଟିଂସମୂହ |"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ଭାଷା"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ଆକାର |"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ଆଲୋକ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ଅନ୍ଧାର"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ସିଷ୍ଟମ୍"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "ଦୃଶ୍ୟ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ଭୟଙ୍କର"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ଗରିବ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ହାରାହାରି"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ବହୁତ ଭଲ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ସଂପୂର୍ଣ୍ଣ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "କ୍ରସ୍ ୱାର୍ଡ ଗୁଣବତ୍ତା |"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "କ୍ରସ୍ ୱାର୍ଡ ବ୍ରାଉଜର୍ |"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ଫେରିଯାଅ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "କ୍ରସ୍ ୱାର୍ଡ ଲୋଡ୍ କରନ୍ତୁ |"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ୱେବ୍ ଆପ୍ ଖୋଲନ୍ତୁ |"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ୱେବ୍ ଆପ୍ ସମାପ୍ତ କରନ୍ତୁ |"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "ଶବ୍ଦ ଗଣନା ପସନ୍ଦ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "ଶବ୍ଦ ଗଣନା ଚୟନ କରନ୍ତୁ |"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "ସର୍ବାଧିକ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "କଷ୍ଟମ୍"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ଏହି ଅପରେସନ୍ କରିବାକୁ, ଆପଣଙ୍କୁ ପ୍ରଥମେ ଏକ କକ୍ଷ ଚୟନ କରିବାକୁ ପଡିବ |"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ଦର୍ଶନ କରନ୍ତୁ |"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ବନ୍ଦ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ଅସୁବିଧା"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ସମୁଦାୟ ଶବ୍ଦ |"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ଅସୁବିଧା"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ଚୟନ କରନ୍ତୁ |"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "ପୁନଃପ୍ରାରମ୍ଭ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ଆପ୍ ପୁନ rest ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ପ୍ରସ୍ଥାନ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ଆପ୍ ଛାଡିବାକୁ ଚାହୁଁଛନ୍ତି କି? ଯଦି ୱେବ୍ ଆପ୍ ଚାଲୁଛି, ତେବେ "
 "ଏହାକୁ ବନ୍ଦ କରିଦିଆଯିବ |"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ଘରକୁ ଫେରନ୍ତୁ |"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "ଆପଣ ନିଶ୍ଚିତ କି ଆପଣ ହୋମ ସ୍କ୍ରିନକୁ ଫେରିବାକୁ ଚାହୁଁଛନ୍ତି କି? ୱେବ୍ ଆପ୍ ସମାପ୍ତ ହେବ"
 " |"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ତ୍ରୁଟି |"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ଏହି ଭାଷା ପୂର୍ବରୁ ମନୋନୀତ ହୋଇଛି |"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ଏହି ଆକାର ପୂର୍ବରୁ ସିଲେକ୍ଟ ହୋଇସାରିଛି |"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ଏହି ଦୃଶ୍ୟଟି ସିଲେକ୍ଟ ହୋଇସାରିଛି |"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ଏହି ଗୁଣବତ୍ତା ପୂର୍ବରୁ ଚୟନ କରାଯାଇଛି |"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ସୂଚନା"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "କିମ୍ବା ସେଗୁଡ଼ିକୁ ବନ୍ଦ କରିବା ପାଇଁ କେବଳ ଆପଣଙ୍କ କମ୍ପ୍ୟୁଟରକୁ ପୁନ rest ଆରମ୍ଭ "
 "କରନ୍ତୁ |"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,126 +231,111 @@ msgstr ""
 "ୱାର୍ଡ ଡାଟା କେବଳ ଆକ୍ସେସ୍ ହୁଏ ଯେତେବେଳେ ଏହାର ଅନୁବାଦିତ ସଂସ୍କରଣ ଲୋକାଲ୍ "
 "ଡିରେକ୍ଟୋରୀରେ ନଥାଏ |"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "କ୍ରସ୍ ୱାର୍ଡ ଉତ୍ପାଦନରେ ଏକ ତ୍ରୁଟି ଘଟିଲା | ଦୟାକରି କନସୋଲରେ ଅଧିକ ସୂଚନା ଦେଖନ୍ତୁ |"
 
-msgid "Easy"
-msgstr "ସହଜ"
-
-msgid "Medium"
-msgstr "ମଧ୍ୟମ"
-
-msgid "Hard"
-msgstr "କଠିନ |"
-
-msgid "Extreme"
-msgstr "ଅତ୍ୟଧିକ"
-
-msgid "Geography"
-msgstr "ଭୂଗୋଳ"
-
-msgid "Math"
-msgstr "ଗଣିତ"
-
-msgid "Science"
-msgstr "ବିଜ୍ଞାନ |"
-
-msgid "Computer Science"
-msgstr "କମ୍ପ୍ୟୁଟର ବିଜ୍ଞାନ"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "ରାଜଧାନୀ"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "କ୍ରସ୍ ୱାର୍ଡ ପଜଲ୍ - ଖେଳ |"
 
-#~ msgid "Countries"
-#~ msgstr "ଦେଶଗୁଡିକ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ପାର୍ଶ୍ୱରେ |"
 
-#~ msgid "Easy"
-#~ msgstr "ସହଜ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ତଳକୁ"
 
-#~ msgid "Medium"
-#~ msgstr "ମଧ୍ୟମ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "ପ୍ରକାଶ କର |"
 
-#~ msgid "Hard"
-#~ msgstr "କଠିନ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "କକ୍ଷ"
 
-#~ msgid "Extreme"
-#~ msgstr "ଅତ୍ୟଧିକ"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "ଶବ୍ଦ"
 
-#~ msgid "Geography"
-#~ msgstr "ଭୂଗୋଳ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ଗ୍ରୀଡ୍"
 
-#~ msgid "Science"
-#~ msgstr "ଆକାର |"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ଯାଞ୍ଚ କରନ୍ତୁ |"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "ଏକ କକ୍ଷ / ଶବ୍ଦ ଯାଞ୍ଚ କିମ୍ବା ପ୍ରକାଶ କରିବାକୁ, ଆପଣଙ୍କୁ ପ୍ରଥମେ ଏକ କକ୍ଷ ଚୟନ "
-#~ "କରିବାକୁ ପଡିବ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ସଫା"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "କ୍ରସ୍ ୱାର୍ଡ ପଜଲ୍ - ଖେଳ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ଣାନ୍ତ ସ୍କିପ୍ କର |"
 
-#~ msgid "Across"
-#~ msgstr "ସମଗ୍ର"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ଜୁମ୍ କରିବାକୁ କ୍ଲିକ୍ କରନ୍ତୁ |"
 
-#~ msgid "Down"
-#~ msgstr "ତଳକୁ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "ତୁମେ ଦେଖୁଛ"
 
-#~ msgid "Reveal"
-#~ msgstr "ପ୍ରକାଶ କରନ୍ତୁ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ଠାରୁ"
 
-#~ msgid "Cell"
-#~ msgstr "କକ୍ଷ"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ଶବ୍ଦ (ଗୁଡିକ) ସନ୍ନିବେଶ କରାଯାଇପାରିବ ନାହିଁ, ଦୁ sorry ଖିତ |"
 
-#~ msgid "Word"
-#~ msgstr "ଶବ୍ଦ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "ଶବ୍ଦ ଗଣନା (ଆଡଜଷ୍ଟ ହୋଇଛି)"
 
-#~ msgid "Grid"
-#~ msgstr "ଗ୍ରୀଡ୍"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "ୱାର୍ଡ ଗଣନା |"
 
-#~ msgid "Check"
-#~ msgstr "ଯାଞ୍ଚ କରନ୍ତୁ |"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ଜାରି ରଖ |"
 
-#~ msgid "Clear"
-#~ msgstr "ସଫା"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "ତୁମେ କ୍ରସ୍ ୱାର୍ଡ ସମାପ୍ତ କରିଛ!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "ଣାନ୍ତ ସ୍କିପ୍ କର |"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ଜୁମ୍ କରିବାକୁ କ୍ଲିକ୍ କରନ୍ତୁ |"
+msgid "Easy"
+msgstr "ସହଜ"
 
-#~ msgid "You are viewing"
-#~ msgstr "ଆପଣ ଦେଖୁଛନ୍ତି |"
+msgid "Medium"
+msgstr "ମଧ୍ୟମ"
 
-#~ msgid "from"
-#~ msgstr "ଠାରୁ"
+msgid "Hard"
+msgstr "କଠିନ |"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ଶବ୍ଦ (ଗୁଡିକ) ସନ୍ନିବେଶ କରାଯାଇପାରିବ ନାହିଁ, ଦୁ sorry ଖିତ।"
+msgid "Extreme"
+msgstr "ଅତ୍ୟଧିକ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "ଶବ୍ଦ ଗଣନା (ସଂଶୋଧିତ)"
+msgid "Geography"
+msgstr "ଭୂଗୋଳ"
 
-#~ msgid "Word count"
-#~ msgstr "ଶବ୍ଦ ଗଣନା |"
+msgid "Math"
+msgstr "ଗଣିତ"
 
-#~ msgid "Continue"
-#~ msgstr "ଜାରି ରଖ |"
+msgid "Science"
+msgstr "ବିଜ୍ଞାନ |"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "ଆପଣ କ୍ରସ୍ ୱାର୍ଡ ସମାପ୍ତ କରିଛନ୍ତି!"
+msgid "Computer Science"
+msgstr "କମ୍ପ୍ୟୁଟର ବିଜ୍ଞାନ"
diff --git a/crossword_puzzle/locales/pa/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/pa/LC_MESSAGES/messages.mo
index 036a467e1..1820321cf 100644
Binary files a/crossword_puzzle/locales/pa/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/pa/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/pa/LC_MESSAGES/messages.po b/crossword_puzzle/locales/pa/LC_MESSAGES/messages.po
index 94ede64b7..864fcac88 100644
--- a/crossword_puzzle/locales/pa/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/pa/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: pa <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ਵਰਗ ਪਹੇਲੀ ਵਾਲੀ ਖੇਡ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ਕ੍ਰਾਸਵਰਡ ਦੇਖੋ"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ਐਪ ਤੋਂ ਬਾਹਰ ਜਾਓ"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ਗਲੋਬਲ ਸੈਟਿੰਗਾਂ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ਭਾਸ਼ਾਵਾਂ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ਆਕਾਰ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ਰੋਸ਼ਨੀ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ਹਨੇਰ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ਸਿਸਟਮ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "ਦਿੱਖ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ਭਿਆਨਕ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ਗਰੀਬ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "average ਸਤ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ਮਹਾਨ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ਸੰਪੂਰਨ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "ਕਰਾਸਵਰਡ ਕੁਆਲਟੀ"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "ਕ੍ਰਾਸਵਰਡ ਬ੍ਰਾਊਜ਼ਰ"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ਵਾਪਸ ਜਾਓ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "ਕ੍ਰਾਸਵਰਡ ਲੋਡ ਕਰੋ"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "ਵੈੱਬ ਐਪ ਖੋਲ੍ਹੋ"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ਵੈੱਬ ਐਪ ਬੰਦ ਕਰੋ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "ਸ਼ਬਦ ਗਿਣਤੀ ਤਰਜੀਹਾਂ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "ਸ਼ਬਦ ਗਿਣਤੀ ਚੁਣੋ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "ਅਧਿਕਤਮ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "ਪ੍ਰਥਾ"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇੱਕ ਸੈੱਲ ਦੀ ਚੋਣ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ਦੇਖੋ"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ਬੰਦ ਕਰੋ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ਮੁਸ਼ਕਲ"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "ਕੁੱਲ ਸ਼ਬਦ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ਮੁਸ਼ਕਲ"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ਚੁਣੋ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "ਰੀਸਟਾਰਟ ਕਰੋ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਐਪ ਨੂੰ ਰੀਸਟਾਰਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ਨਿਕਾਸ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਐਪ ਤੋਂ ਬਾਹਰ ਜਾਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਜੇਕਰ ਵੈੱਬ ਐਪ ਚੱਲ ਰਹੀ ਹੈ,"
 " ਤਾਂ ਇਸਨੂੰ ਬੰਦ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ਵਾਪਸ ਘਰ"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਯਕੀਨੀ ਤੌਰ 'ਤੇ ਹੋਮ ਸਕ੍ਰੀਨ 'ਤੇ ਵਾਪਸ ਜਾਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਵੈੱਬ ਐਪ ਨੂੰ ਬੰਦ "
 "ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ।"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ਇਹ ਭਾਸ਼ਾ ਪਹਿਲਾਂ ਹੀ ਚੁਣੀ ਹੋਈ ਹੈ।"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ਇਹ ਆਕਾਰ ਪਹਿਲਾਂ ਹੀ ਚੁਣਿਆ ਹੋਇਆ ਹੈ।"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ਇਹ ਦਿੱਖ ਪਹਿਲਾਂ ਹੀ ਚੁਣੀ ਹੋਈ ਹੈ।"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ਇਹ ਗੁਣ ਪਹਿਲਾਂ ਹੀ ਚੁਣਿਆ ਗਿਆ ਹੈ."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ਜਾਣਕਾਰੀ"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "ਢੰਗ ਨਾਲ ਬੰਦ ਨਹੀਂ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ, ਨੂੰ MacOS 'ਤੇ ਗਤੀਵਿਧੀ ਮਾਨੀਟਰ ਦੁਆਰਾ ਸਮਾਪਤ "
 "ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਾਂ, ਉਹਨਾਂ ਨੂੰ ਖਤਮ ਕਰਨ ਲਈ ਆਪਣੇ ਕੰਪਿਊਟਰ ਨੂੰ ਮੁੜ ਚਾਲੂ ਕਰੋ।"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,126 +230,111 @@ msgstr ""
 "ਕ੍ਰਾਸਵਰਡ ਡੇਟਾ ਨੂੰ ਕੇਵਲ ਉਦੋਂ ਹੀ ਐਕਸੈਸ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਜਦੋਂ ਇਸਦਾ ਅਨੁਵਾਦਿਤ ਸੰਸਕਰਣ"
 " ਲੋਕੇਲ ਡਾਇਰੈਕਟਰੀ ਵਿੱਚ ਮੌਜੂਦ ਨਹੀਂ ਹੁੰਦਾ ਹੈ।"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr ""
 "ਕ੍ਰਾਸਵਰਡ ਬਣਾਉਣ ਵਿੱਚ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਕੰਸੋਲ ਵਿੱਚ ਹੋਰ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-msgid "Easy"
-msgstr "ਆਸਾਨ"
-
-msgid "Medium"
-msgstr "ਦਰਮਿਆਨਾ"
-
-msgid "Hard"
-msgstr "ਸਖ਼ਤ"
-
-msgid "Extreme"
-msgstr "ਅਤਿ"
-
-msgid "Geography"
-msgstr "ਭੂਗੋਲ"
-
-msgid "Math"
-msgstr "ਗਣਿਤ"
-
-msgid "Science"
-msgstr "ਵਿਗਿਆਨ"
-
-msgid "Computer Science"
-msgstr "ਕੰਪਿਊਟਰ ਵਿਗਿਆਨ"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "ਰਾਜਧਾਨੀਆਂ"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ਕ੍ਰਾਸਵਰਡ ਬੁਝਾਰਤ - ਗੇਮ"
 
-#~ msgid "Countries"
-#~ msgstr "ਦੇਸ਼"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ਪਾਰ"
 
-#~ msgid "Easy"
-#~ msgstr "ਆਸਾਨ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ਥੱਲੇ, ਹੇਠਾਂ, ਨੀਂਵਾ"
 
-#~ msgid "Medium"
-#~ msgstr "ਦਰਮਿਆਨਾ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "ਪ੍ਰਗਟ"
 
-#~ msgid "Hard"
-#~ msgstr "ਸਖ਼ਤ"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ਸੈੱਲ"
 
-#~ msgid "Extreme"
-#~ msgstr "ਅਤਿ"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "ਸ਼ਬਦ"
 
-#~ msgid "Geography"
-#~ msgstr "ਭੂਗੋਲ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ਗਰਿੱਡ"
 
-#~ msgid "Science"
-#~ msgstr "ਆਕਾਰ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ਚੈਕ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "ਕਿਸੇ ਸੈੱਲ/ਸ਼ਬਦ ਦੀ ਜਾਂਚ ਕਰਨ ਜਾਂ ਪ੍ਰਗਟ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇੱਕ ਸੈੱਲ ਚੁਣਨਾ "
-#~ "ਚਾਹੀਦਾ ਹੈ"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ਸਾਫ"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ਕ੍ਰਾਸਵਰਡ ਪਹੇਲੀ - ਗੇਮ"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ਸਮਾਰਟ ਛੱਡੋ"
 
-#~ msgid "Across"
-#~ msgstr "ਪਾਰ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "ਜ਼ੂਮ ਕਰਨ ਲਈ ਕਲਿਕ ਕਰੋ"
 
-#~ msgid "Down"
-#~ msgstr "ਥੱਲੇ, ਹੇਠਾਂ, ਨੀਂਵਾ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "ਤੁਸੀਂ ਦੇਖ ਰਹੇ ਹੋ"
 
-#~ msgid "Reveal"
-#~ msgstr "ਪ੍ਰਗਟ"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ਤੋਂ"
 
-#~ msgid "Cell"
-#~ msgstr "ਸੈੱਲ"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ਸ਼ਬਦ (ਜ਼) ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਮਾਫ ਕਰਨਾ."
 
-#~ msgid "Word"
-#~ msgstr "ਸ਼ਬਦ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "ਸ਼ਬਦ ਗਿਣਤੀ (ਐਡਜਸਟ)"
 
-#~ msgid "Grid"
-#~ msgstr "ਗਰਿੱਡ"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "ਸ਼ਬਦ ਗਿਣਤੀ"
 
-#~ msgid "Check"
-#~ msgstr "ਚੈਕ"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ਜਾਰੀ ਰੱਖੋ"
 
-#~ msgid "Clear"
-#~ msgstr "ਸਾਫ਼"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "ਤੁਸੀਂ ਕਰਾਸਵਰਡ ਨੂੰ ਪੂਰਾ ਕੀਤਾ!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "ਸਮਾਰਟ ਛੱਡੋ"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "ਜ਼ੂਮ ਕਰਨ ਲਈ ਕਲਿਕ ਕਰੋ"
+msgid "Easy"
+msgstr "ਆਸਾਨ"
 
-#~ msgid "You are viewing"
-#~ msgstr "ਤੁਸੀਂ ਦੇਖ ਰਹੇ ਹੋ"
+msgid "Medium"
+msgstr "ਦਰਮਿਆਨਾ"
 
-#~ msgid "from"
-#~ msgstr "ਤੋਂ"
+msgid "Hard"
+msgstr "ਸਖ਼ਤ"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ਸ਼ਬਦ (ਸ਼ਬਦਾਂ) ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਮੁਆਫ ਕਰਨਾ।"
+msgid "Extreme"
+msgstr "ਅਤਿ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "ਸ਼ਬਦ ਗਿਣਤੀ (ਵਿਵਸਥਿਤ)"
+msgid "Geography"
+msgstr "ਭੂਗੋਲ"
 
-#~ msgid "Word count"
-#~ msgstr "ਸ਼ਬਦ ਗਿਣਤੀ"
+msgid "Math"
+msgstr "ਗਣਿਤ"
 
-#~ msgid "Continue"
-#~ msgstr "ਜਾਰੀ ਰੱਖੋ"
+msgid "Science"
+msgstr "ਵਿਗਿਆਨ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "ਤੁਸੀਂ ਕ੍ਰਾਸਵਰਡ ਨੂੰ ਪੂਰਾ ਕੀਤਾ!"
+msgid "Computer Science"
+msgstr "ਕੰਪਿਊਟਰ ਵਿਗਿਆਨ"
diff --git a/crossword_puzzle/locales/pl/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/pl/LC_MESSAGES/messages.mo
index 1f811c2b7..98f6edc62 100644
Binary files a/crossword_puzzle/locales/pl/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/pl/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/pl/LC_MESSAGES/messages.po b/crossword_puzzle/locales/pl/LC_MESSAGES/messages.po
index e0f6d96a1..c60ea8cb0 100644
--- a/crossword_puzzle/locales/pl/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: pl <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krzyżówka"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Zobacz krzyżówki"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Wyjdź z aplikacji"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Ustawienia ogólne"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Języki"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Rozmiar"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "światło"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "ciemny"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "system"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Wygląd"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "straszny"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "słaby"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "przeciętny"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Świetnie"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "doskonały"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Jakość krzyżówki"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Przeglądarka krzyżówek"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Wróć"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Załaduj krzyżówkę"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Otwórz aplikację internetową"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Zakończ aplikację internetową"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferencje dotyczące liczby słów"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Wybierz liczbę słów"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksymalny"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Zwyczaj"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Aby wykonać tę operację, musisz najpierw wybrać komórkę."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Pogląd"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zamknąć"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "trudność"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Suma słów"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Trudność"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Wybierać"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Uruchom ponownie"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Czy na pewno chcesz ponownie uruchomić aplikację?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Wyjście"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Czy na pewno chcesz wyjść z aplikacji? Jeśli aplikacja internetowa jest "
 "uruchomiona, zostanie zakończona."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Wrócić do domu"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Czy na pewno chcesz wrócić do ekranu głównego? Aplikacja internetowa "
 "zostanie wyłączona."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Błąd"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ten język jest już wybrany."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ten rozmiar jest już wybrany."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ten wygląd jest już wybrany."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ta jakość jest już wybrana."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informacje"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "pomocą Monitora aktywności w systemie MacOS lub po prostu ponownie uruchomić"
 " komputer, aby je zakończyć."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "Bazowe dane krzyżówki są dostępne tylko wtedy, gdy ich przetłumaczona wersja"
 " nie znajduje się w katalogu ustawień regionalnych."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,118 +239,104 @@ msgstr ""
 "Wystąpił błąd podczas generowania krzyżówki. Więcej informacji znajdziesz w "
 "konsoli"
 
-msgid "Easy"
-msgstr "Łatwy"
-
-msgid "Medium"
-msgstr "Średni"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krzyżówka - gra"
 
-msgid "Hard"
-msgstr "Twardy"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Przez"
 
-msgid "Extreme"
-msgstr "Skrajny"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "W dół"
 
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matematyka"
-
-msgid "Science"
-msgstr "Nauka"
-
-msgid "Computer Science"
-msgstr "Informatyka"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ujawnić"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Komórka"
 
-#~ msgid "Capitals"
-#~ msgstr "Stolice"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Słowo"
 
-#~ msgid "Countries"
-#~ msgstr "Kraje"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Siatka"
 
-#~ msgid "Easy"
-#~ msgstr "Łatwy"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Sprawdzać"
 
-#~ msgid "Medium"
-#~ msgstr "Średni"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Jasne"
 
-#~ msgid "Hard"
-#~ msgstr "Twardy"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Skrajny"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kliknij, aby powiększyć"
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Oglądasz"
 
-#~ msgid "Science"
-#~ msgstr "Rozmiar"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "z"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Aby sprawdzić lub odkryć komórkę/słowo, musisz najpierw wybrać komórkę"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Nie można było wstawić słów, przepraszam."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krzyżówka - gra"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Liczba słów (dostosowana)"
 
-#~ msgid "Across"
-#~ msgstr "Przez"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Liczba słów"
 
-#~ msgid "Down"
-#~ msgstr "W dół"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Kontynuować"
 
-#~ msgid "Reveal"
-#~ msgstr "Ujawnić"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ukończyłeś krzyżówkę!"
 
-#~ msgid "Cell"
-#~ msgstr "Komórka"
-
-#~ msgid "Word"
-#~ msgstr "Słowo"
-
-#~ msgid "Grid"
-#~ msgstr "Siatka"
-
-#~ msgid "Check"
-#~ msgstr "Sprawdzać"
-
-#~ msgid "Clear"
-#~ msgstr "Jasne"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kliknij, aby powiększyć"
+msgid "Easy"
+msgstr "Łatwy"
 
-#~ msgid "You are viewing"
-#~ msgstr "Oglądasz"
+msgid "Medium"
+msgstr "Średni"
 
-#~ msgid "from"
-#~ msgstr "z"
+msgid "Hard"
+msgstr "Twardy"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Nie można wstawić słów, przepraszam."
+msgid "Extreme"
+msgstr "Skrajny"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Liczba słów (skorygowana)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Liczba słów"
+msgid "Math"
+msgstr "Matematyka"
 
-#~ msgid "Continue"
-#~ msgstr "Kontynuować"
+msgid "Science"
+msgstr "Nauka"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Ukończyłeś krzyżówkę!"
+msgid "Computer Science"
+msgstr "Informatyka"
diff --git a/crossword_puzzle/locales/pt/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/pt/LC_MESSAGES/messages.mo
index 985a946eb..1bbd88b94 100644
Binary files a/crossword_puzzle/locales/pt/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/pt/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/pt/LC_MESSAGES/messages.po b/crossword_puzzle/locales/pt/LC_MESSAGES/messages.po
index d4103f359..d38e97573 100644
--- a/crossword_puzzle/locales/pt/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/pt/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: pt <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Palavras cruzadas"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Ver palavras cruzadas"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Saia do aplicativo"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Configurações globais"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "línguas"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Tamanho"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "luz"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "escuro"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aparência"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "terrível"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "pobre"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "média"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ótimo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfeito"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Qualidade de palavras cruzadas"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Navegador de palavras cruzadas"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Volte"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Carregar palavras cruzadas"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Abra o aplicativo da web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Encerrar aplicativo da web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferências de contagem de palavras"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Selecione a contagem de palavras"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Máximo"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Personalizado"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Para executar esta operação, você deve primeiro selecionar uma célula."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Visualizar"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Fechar"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "dificuldade"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Total de palavras"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dificuldade"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Selecione"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Tem certeza de que deseja reiniciar o aplicativo?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Saída"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,11 +159,11 @@ msgstr ""
 "Tem certeza de que deseja sair do aplicativo? Se o aplicativo da web estiver"
 " em execução, ele será encerrado."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "De volta para casa"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -180,32 +171,33 @@ msgstr ""
 "Tem certeza de que deseja voltar para a tela inicial? O aplicativo da web "
 "será encerrado."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Erro"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Este idioma já está selecionado."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Este tamanho já está selecionado."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Esta aparência já está selecionada."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Esta qualidade já está selecionada."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informações"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 "encerrados corretamente podem ser encerrados por meio do Activity Monitor no"
 " MacOS ou simplesmente reiniciar o computador para encerrá-los."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "NOTA: Os dados básicos das palavras cruzadas só são acessados quando sua "
 "versão traduzida não está presente no diretório locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Ocorreu um erro na geração de palavras cruzadas. Por favor, veja mais "
 "informações no console"
 
-msgid "Easy"
-msgstr "Fácil"
-
-msgid "Medium"
-msgstr "Médio"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Palavras cruzadas - Jogo"
 
-msgid "Hard"
-msgstr "Duro"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Do outro lado"
 
-msgid "Extreme"
-msgstr "Extremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Baixo"
 
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matemática"
-
-msgid "Science"
-msgstr "Ciência"
-
-msgid "Computer Science"
-msgstr "Ciência da Computação"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Revelar"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Célula"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitais"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Palavra"
 
-#~ msgid "Countries"
-#~ msgstr "Países"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grade"
 
-#~ msgid "Easy"
-#~ msgstr "Fácil"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Verifique"
 
-#~ msgid "Medium"
-#~ msgstr "Médio"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Claro"
 
-#~ msgid "Hard"
-#~ msgstr "Duro"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Pular Inteligente"
 
-#~ msgid "Extreme"
-#~ msgstr "Extremo"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Clique para ampliar"
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Você está visualizando"
 
-#~ msgid "Science"
-#~ msgstr "Tamanho"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "de"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Para verificar ou revelar uma célula/palavra, você deve primeiro selecionar "
-#~ "uma célula"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "palavra(s) não pôde(m) ser inserida(s), desculpe."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Palavras Cruzadas - Jogo"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Contagem de palavras (ajustada)"
 
-#~ msgid "Across"
-#~ msgstr "Entre"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Contagem de palavras"
 
-#~ msgid "Down"
-#~ msgstr "Abaixo"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continuar"
 
-#~ msgid "Reveal"
-#~ msgstr "Revelar"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Você completou as palavras cruzadas!"
 
-#~ msgid "Cell"
-#~ msgstr "Célula"
-
-#~ msgid "Word"
-#~ msgstr "Palavra"
-
-#~ msgid "Grid"
-#~ msgstr "Grade"
-
-#~ msgid "Check"
-#~ msgstr "Verificar"
-
-#~ msgid "Clear"
-#~ msgstr "Claro"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Skip Smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Clique para aumentar o zoom"
+msgid "Easy"
+msgstr "Fácil"
 
-#~ msgid "You are viewing"
-#~ msgstr "Você está visualizando"
+msgid "Medium"
+msgstr "Médio"
 
-#~ msgid "from"
-#~ msgstr "de"
+msgid "Hard"
+msgstr "Duro"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "palavra(s) não pôde(m) ser inserida(s), desculpe."
+msgid "Extreme"
+msgstr "Extremo"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Contagem de palavras (ajustada)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Contagem de palavras"
+msgid "Math"
+msgstr "Matemática"
 
-#~ msgid "Continue"
-#~ msgstr "Continuar"
+msgid "Science"
+msgstr "Ciência"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Você completou as palavras cruzadas!"
+msgid "Computer Science"
+msgstr "Ciência da Computação"
diff --git a/crossword_puzzle/locales/ro/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ro/LC_MESSAGES/messages.mo
index 968e5c215..62327cde3 100644
Binary files a/crossword_puzzle/locales/ro/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ro/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ro/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ro/LC_MESSAGES/messages.po
index 41213ba16..57c40e5e0 100644
--- a/crossword_puzzle/locales/ro/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ro/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ro <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Cuvinte încrucișate"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Vizualizați cuvinte încrucișate"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ieșiți din aplicație"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Setări globale"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Limbi"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "mărimea"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ușoară"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "întuneric"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Aspect"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "teribil"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "sărac"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "in medie"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Grozav"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfect"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Calitatea de cuvinte încrucișate"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Browser de cuvinte încrucișate"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Întoarce-te"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Încarcă cuvinte încrucișate"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Deschideți aplicația web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Închideți aplicația web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferințe pentru numărul de cuvinte"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Selectați numărul de cuvinte"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maxim"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Personalizat"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Pentru a efectua această operație, trebuie să selectați mai întâi o celulă."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Vedere"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Închide"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "dificultate"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Cuvinte în total"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dificultate"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Selectați"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Repornire"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Sigur doriți să reporniți aplicația?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ieșire"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,43 +159,44 @@ msgstr ""
 "Sigur doriți să părăsiți aplicația? Dacă aplicația web rulează, aceasta va "
 "fi oprită."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Înapoi acasă"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Sigur doriți să reveniți la ecranul de pornire? Aplicația web va fi închisă."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Eroare"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Această limbă este deja selectată."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Această dimensiune este deja selectată."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Acest aspect este deja selectat."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Această calitate este deja selectată."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "au fost încheiate în mod corespunzător pot fi încheiate prin Activity "
 "Monitor pe MacOS sau pur și simplu reporniți computerul pentru a le închide."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "cwords. NOTĂ: Datele de bază ale cuvintelor încrucișate sunt accesate numai "
 "atunci când versiunea sa tradusă nu este prezentă în directorul locale."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "A apărut o eroare la generarea cuvintelor încrucișate. Vă rugăm să vedeți "
 "mai multe informații în consolă"
 
-msgid "Easy"
-msgstr "Uşor"
-
-msgid "Medium"
-msgstr "Mediu"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle cu cuvinte încrucișate - joc"
 
-msgid "Hard"
-msgstr "Greu"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Peste"
 
-msgid "Extreme"
-msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Jos"
 
-msgid "Geography"
-msgstr "Geografie"
-
-msgid "Math"
-msgstr "Matematică"
-
-msgid "Science"
-msgstr "Ştiinţă"
-
-msgid "Computer Science"
-msgstr "Informatică"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Dezvălui"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Celulă"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitalele"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Cuvânt"
 
-#~ msgid "Countries"
-#~ msgstr "Țări"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grilă"
 
-#~ msgid "Easy"
-#~ msgstr "Uşor"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Verifica"
 
-#~ msgid "Medium"
-#~ msgstr "Mediu"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "clar"
 
-#~ msgid "Hard"
-#~ msgstr "Greu"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Skip inteligent"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Faceți clic pentru a mări"
 
-#~ msgid "Geography"
-#~ msgstr "Geografie"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Vizualizați"
 
-#~ msgid "Science"
-#~ msgstr "mărimea"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "din"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Pentru a verifica sau dezvălui o celulă/cuvânt, trebuie mai întâi să "
-#~ "selectați o celulă"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Cuvântul (cuvintele) nu au putut fi introduse, îmi pare rău."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Cuvinte încrucișate - Joc"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Număr de cuvinte (ajustat)"
 
-#~ msgid "Across"
-#~ msgstr "Peste tot"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Număr de cuvinte"
 
-#~ msgid "Down"
-#~ msgstr "Jos"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Continua"
 
-#~ msgid "Reveal"
-#~ msgstr "Dezvălui"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ai completat cuvântul încrucișat!"
 
-#~ msgid "Cell"
-#~ msgstr "Celulă"
-
-#~ msgid "Word"
-#~ msgstr "Cuvânt"
-
-#~ msgid "Grid"
-#~ msgstr "Grilă"
-
-#~ msgid "Check"
-#~ msgstr "Verifica"
-
-#~ msgid "Clear"
-#~ msgstr "clar"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Skip inteligent"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Faceți clic pentru a mări"
+msgid "Easy"
+msgstr "Uşor"
 
-#~ msgid "You are viewing"
-#~ msgstr "Vizionați"
+msgid "Medium"
+msgstr "Mediu"
 
-#~ msgid "from"
-#~ msgstr "din"
+msgid "Hard"
+msgstr "Greu"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "cuvintele nu au putut fi inserate, scuze."
+msgid "Extreme"
+msgstr "Extrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Număr de cuvinte (ajustat)"
+msgid "Geography"
+msgstr "Geografie"
 
-#~ msgid "Word count"
-#~ msgstr "Număr de cuvinte"
+msgid "Math"
+msgstr "Matematică"
 
-#~ msgid "Continue"
-#~ msgstr "Continua"
+msgid "Science"
+msgstr "Ştiinţă"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Ai completat cuvintele încrucișate!"
+msgid "Computer Science"
+msgstr "Informatică"
diff --git a/crossword_puzzle/locales/ru/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ru/LC_MESSAGES/messages.mo
index 7461a49c1..38bf32940 100644
Binary files a/crossword_puzzle/locales/ru/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ru/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ru/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ru/LC_MESSAGES/messages.po
index 4a3a9cb6d..6cab9d38d 100644
--- a/crossword_puzzle/locales/ru/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ru <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Кроссворд"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Посмотреть кроссворды"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Выйти из приложения"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобальные настройки"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Языки"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Размер"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "свет"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "темный"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "система"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Появление"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ужасный"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "бедный"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "средний"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "большой"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "идеальный"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Качество кроссворда"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Браузер кроссвордов"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Возвращаться"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Загрузить кроссворд"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Открыть веб-приложение"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Завершить веб-приложение"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Настройки количества слов"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Выберите количество слов"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максимум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Обычай"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Чтобы выполнить эту операцию, вы должны сначала выбрать ячейку."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Вид"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Закрывать"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "трудность"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Всего слов"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Сложность"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Выбирать"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Перезапуск"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Вы уверены, что хотите перезапустить приложение?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Выход"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Вы уверены, что хотите выйти из приложения? Если веб-приложение запущено, "
 "оно будет прекращено."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Вернуться домой"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Вы уверены, что хотите вернуться на главный экран? Веб-приложение будет "
 "прекращено."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Ошибка"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Этот язык уже выбран."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Этот размер уже выбран."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Этот внешний вид уже выбран."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Это качество уже выбрано."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Информация"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "были завершены должным образом, можно завершить с помощью Монитора "
 "активности в MacOS или просто перезагрузить компьютер, чтобы завершить их."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "Доступ к базовым данным кроссворда возможен только в том случае, если его "
 "переведенная версия отсутствует в каталоге локалей."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Произошла ошибка при создании кроссворда. Дополнительную информацию смотрите"
 " в консоли."
 
-msgid "Easy"
-msgstr "Легкий"
-
-msgid "Medium"
-msgstr "Середина"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Кроссворд головоломка - игра"
 
-msgid "Hard"
-msgstr "Жесткий"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Через"
 
-msgid "Extreme"
-msgstr "Экстрим"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Вниз"
 
-msgid "Geography"
-msgstr "География"
-
-msgid "Math"
-msgstr "Математика"
-
-msgid "Science"
-msgstr "Наука"
-
-msgid "Computer Science"
-msgstr "Информатика"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Раскрывать"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Клетка"
 
-#~ msgid "Capitals"
-#~ msgstr "Столицы"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Слово"
 
-#~ msgid "Countries"
-#~ msgstr "Страны"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Сетка"
 
-#~ msgid "Easy"
-#~ msgstr "Легкий"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Проверять"
 
-#~ msgid "Medium"
-#~ msgstr "Середина"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Прозрачный"
 
-#~ msgid "Hard"
-#~ msgstr "Жесткий"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Умный пропуск"
 
-#~ msgid "Extreme"
-#~ msgstr "Экстрим"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Нажмите, чтобы увеличить"
 
-#~ msgid "Geography"
-#~ msgstr "География"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Вы просматриваете"
 
-#~ msgid "Science"
-#~ msgstr "Размер"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "от"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Чтобы проверить или раскрыть ячейку/слово, сначала необходимо выбрать ячейку"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Слова (ы) не могут быть вставлены, извините."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Кроссворд - игра"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Количество слов (скорректировано)"
 
-#~ msgid "Across"
-#~ msgstr "Через"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Количество слов"
 
-#~ msgid "Down"
-#~ msgstr "Вниз"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Продолжать"
 
-#~ msgid "Reveal"
-#~ msgstr "Раскрывать"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Вы завершили кроссворд!"
 
-#~ msgid "Cell"
-#~ msgstr "Клетка"
-
-#~ msgid "Word"
-#~ msgstr "Слово"
-
-#~ msgid "Grid"
-#~ msgstr "Сетка"
-
-#~ msgid "Check"
-#~ msgstr "Проверять"
-
-#~ msgid "Clear"
-#~ msgstr "Прозрачный"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Умный пропуск"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Нажмите, чтобы увеличить"
+msgid "Easy"
+msgstr "Легкий"
 
-#~ msgid "You are viewing"
-#~ msgstr "Вы просматриваете"
+msgid "Medium"
+msgstr "Середина"
 
-#~ msgid "from"
-#~ msgstr "от"
+msgid "Hard"
+msgstr "Жесткий"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "слово(а) не удалось вставить, извините."
+msgid "Extreme"
+msgstr "Экстрим"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Количество слов (скорректировано)"
+msgid "Geography"
+msgstr "География"
 
-#~ msgid "Word count"
-#~ msgstr "Количество слов"
+msgid "Math"
+msgstr "Математика"
 
-#~ msgid "Continue"
-#~ msgstr "Продолжать"
+msgid "Science"
+msgstr "Наука"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Вы разгадали кроссворд!"
+msgid "Computer Science"
+msgstr "Информатика"
diff --git a/crossword_puzzle/locales/si/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/si/LC_MESSAGES/messages.mo
index e2045b1cb..612433a49 100644
Binary files a/crossword_puzzle/locales/si/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/si/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/si/LC_MESSAGES/messages.po b/crossword_puzzle/locales/si/LC_MESSAGES/messages.po
index 7a7e3f825..c19f206a7 100644
--- a/crossword_puzzle/locales/si/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/si/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: si <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "හරස්පද ප්රහේලිකාව"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "හරස්පද බලන්න"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "යෙදුමෙන් පිටවන්න"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "ගෝලීය සැකසුම්"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "භාෂා"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ප්රමාණය"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ආලෝකය"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "අඳුරු"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "පද්ධති"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "පෙනුම"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "භයානක"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "දුප්පත්"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "සාමාන්යය"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "මහා"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "පරිපූර්ණ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "හරස්පදයේ ගුණාත්මකභාවය"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "හරස්පද බ්‍රව්සරය"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "ආපසු යන්න"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "හරස්පද පැටවීම"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "වෙබ් යෙදුම විවෘත කරන්න"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "වෙබ් යෙදුම අවසන් කරන්න"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "වචන ගණන් කිරීමේ මනාපයන්"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "වචන ගණන තෝරන්න"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "උපරිම"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "අභිරුචි"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "මෙම මෙහෙයුම සිදු කිරීම සඳහා, ඔබ මුලින්ම කොටුවක් තෝරා ගත යුතුය."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "දැක්ම"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "වසන්න"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "දුෂ්කරතාව"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "සම්පූර්ණ වචන"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "දුෂ්කරතාව"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "තෝරන්න"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "යළි අරඹන්න"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "ඔබට යෙදුම නැවත ආරම්භ කිරීමට අවශ්‍ය බව විශ්වාසද?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "පිටවීම"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "ඔබට යෙදුමෙන් පිටවීමට අවශ්‍ය බව විශ්වාසද? වෙබ් යෙදුම ක්‍රියාත්මක වන්නේ නම්, "
 "එය අවසන් වේ."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "ආපසු නිවසට"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "ඔබට මුල් තිරය වෙත ආපසු යාමට අවශ්‍ය බව විශ්වාසද? වෙබ් යෙදුම අවසන් වනු ඇත."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "දෝෂයකි"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "මෙම භාෂාව දැනටමත් තෝරා ඇත."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "මෙම ප්රමාණය දැනටමත් තෝරා ඇත."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "මෙම පෙනුම දැනටමත් තෝරා ඇත."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "මෙම ගුණාංගය දැනටමත් තෝරාගෙන ඇත."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "තොරතුරු"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "මොනිටරය හරහා අවසන් කළ හැකිය, නැතහොත්, ඒවා අවසන් කිරීමට ඔබේ පරිගණකය නැවත "
 "ආරම්භ කරන්න."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -236,7 +228,7 @@ msgstr ""
 "ගොනුව මූලික cwords නාමාවලියෙහි පවතින බව සහතික කර ගන්න. සටහන: මූලික හරස්පද "
 "දත්ත ප්‍රවේශ වන්නේ එහි පරිවර්තිත අනුවාදය ස්ථාන නාමාවලියෙහි නොමැති විට පමණි."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -244,118 +236,104 @@ msgstr ""
 "හරස්පද උත්පාදනය කිරීමේදී දෝෂයක් සිදු විය. කරුණාකර කොන්සෝලයේ වැඩිදුර තොරතුරු "
 "බලන්න"
 
-msgid "Easy"
-msgstr "පහසු"
-
-msgid "Medium"
-msgstr "මධ්යම"
-
-msgid "Hard"
-msgstr "අමාරුයි"
-
-msgid "Extreme"
-msgstr "අන්ත"
-
-msgid "Geography"
-msgstr "භූගෝල විද්යාව"
-
-msgid "Math"
-msgstr "ගණිතය"
-
-msgid "Science"
-msgstr "විද්යාව"
-
-msgid "Computer Science"
-msgstr "පරිගණක විද්යාව"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "ප්රාග්ධන"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "හරස්පද ප්රහේලිකාව - ක්රීඩාව"
 
-#~ msgid "Countries"
-#~ msgstr "රටවල්"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "හරහා"
 
-#~ msgid "Easy"
-#~ msgstr "පහසු"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "පහළ"
 
-#~ msgid "Medium"
-#~ msgstr "මධ්යම"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "හෙළි කරන්න"
 
-#~ msgid "Hard"
-#~ msgstr "අමාරුයි"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "කොටුව"
 
-#~ msgid "Extreme"
-#~ msgstr "අන්ත"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "වචනය"
 
-#~ msgid "Geography"
-#~ msgstr "භූගෝල විද්යාව"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "ජාලකය"
 
-#~ msgid "Science"
-#~ msgstr "ප්රමාණය"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "චෙක් පත"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "කොටුවක්/වචනයක් පරීක්ෂා කිරීමට හෝ හෙළි කිරීමට, ඔබ පළමුව කොටුවක් තෝරාගත යුතුය"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "පැහැදිලිව"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "හරස්පද ප්‍රහේලිකාව - ක්‍රීඩාව"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ස්මාර්ට් මඟ හැරීම"
 
-#~ msgid "Across"
-#~ msgstr "හරහා"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "විශාලනය කිරීමට ක්ලික් කරන්න"
 
-#~ msgid "Down"
-#~ msgstr "පහළ"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "ඔබ නරඹනවා"
 
-#~ msgid "Reveal"
-#~ msgstr "හෙළි කරන්න"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "සිට"
 
-#~ msgid "Cell"
-#~ msgstr "සෛලය"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "වචන (ය) ඇතුළත් කළ නොහැක, සමාවෙන්න."
 
-#~ msgid "Word"
-#~ msgstr "වචනය"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "වචන ගණන (සකස් කර ඇත)"
 
-#~ msgid "Grid"
-#~ msgstr "ජාලකය"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "වචන ගණන"
 
-#~ msgid "Check"
-#~ msgstr "චෙක් පත"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "දිගටම කරගෙන යන්න"
 
-#~ msgid "Clear"
-#~ msgstr "පැහැදිලිව"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "ඔබ හරස්පදය සම්පූර්ණ කළා!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "ස්මාර්ට් මඟ හැරීම"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "විශාලනය කිරීමට ක්ලික් කරන්න"
+msgid "Easy"
+msgstr "පහසු"
 
-#~ msgid "You are viewing"
-#~ msgstr "ඔබ නරඹමින් සිටී"
+msgid "Medium"
+msgstr "මධ්යම"
 
-#~ msgid "from"
-#~ msgstr "සිට"
+msgid "Hard"
+msgstr "අමාරුයි"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "වචනය(ය) ඇතුලත් කල නොහැක, සමාවන්න."
+msgid "Extreme"
+msgstr "අන්ත"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "වචන ගණන (ගැලපුම්)"
+msgid "Geography"
+msgstr "භූගෝල විද්යාව"
 
-#~ msgid "Word count"
-#~ msgstr "වචන ගණන"
+msgid "Math"
+msgstr "ගණිතය"
 
-#~ msgid "Continue"
-#~ msgstr "දිගටම කරගෙන යන්න"
+msgid "Science"
+msgstr "විද්යාව"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "ඔබ හරස්පද සම්පූර්ණ කළා!"
+msgid "Computer Science"
+msgstr "පරිගණක විද්යාව"
diff --git a/crossword_puzzle/locales/sk/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sk/LC_MESSAGES/messages.mo
index c1e3ee56a..e96f73946 100644
Binary files a/crossword_puzzle/locales/sk/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sk/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sk/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sk/LC_MESSAGES/messages.po
index c3c5d6dcd..802c574c9 100644
--- a/crossword_puzzle/locales/sk/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sk/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sk <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krížovka"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Zobraziť krížovky"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ukončite aplikáciu"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globálne nastavenia"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Jazyky"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Veľkosť"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "svetlo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tmavé"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "systém"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Vzhľad"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "hrozný"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "chudobný"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "priemer"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "skvelý"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "dokonalý"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kvalita krížovky"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Prehliadač krížoviek"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Vráť sa"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Načítať krížovku"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Otvorte webovú aplikáciu"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Ukončite webovú aplikáciu"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Predvoľby počtu slov"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Vyberte počet slov"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximálne"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Vlastné"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Na vykonanie tejto operácie musíte najskôr vybrať bunku."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "vyhliadka"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zavrieť"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "obtiažnosť"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Celkom slov"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Obtiažnosť"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Vyberte"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Reštart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Naozaj chcete reštartovať aplikáciu?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "VÝCHOD"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Naozaj chcete ukončiť aplikáciu? Ak je webová aplikácia spustená, bude "
 "ukončená."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Späť domov"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Naozaj sa chcete vrátiť na domovskú obrazovku? Webová aplikácia bude "
 "ukončená."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Chyba"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Tento jazyk je už vybratý."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Táto veľkosť je už vybratá."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Tento vzhľad je už vybratý."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Táto kvalita je už vybraná."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 " správne ukončené, je možné ukončiť prostredníctvom Monitora aktivity v "
 "systéme MacOS alebo ich ukončíte jednoducho reštartovaním počítača."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "POZNÁMKA: Základné údaje krížovky sú prístupné len vtedy, keď sa ich "
 "preložená verzia nenachádza v adresári locales."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,118 +237,104 @@ msgstr ""
 "Pri generovaní krížovky sa vyskytla chyba. Ďalšie informácie nájdete v "
 "konzole"
 
-msgid "Easy"
-msgstr "Jednoduché"
-
-msgid "Medium"
-msgstr "Stredná"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krížovka - hra"
 
-msgid "Hard"
-msgstr "Ťažko"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Naprieč"
 
-msgid "Extreme"
-msgstr "Extrémne"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Dole"
 
-msgid "Geography"
-msgstr "Geografia"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Veda"
-
-msgid "Computer Science"
-msgstr "Počítačová veda"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Odhaliť"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Bunka"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitals"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Označenie"
 
-#~ msgid "Countries"
-#~ msgstr "krajiny"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Mriežka"
 
-#~ msgid "Easy"
-#~ msgstr "Jednoduché"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrola"
 
-#~ msgid "Medium"
-#~ msgstr "Stredná"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "jasný"
 
-#~ msgid "Hard"
-#~ msgstr "Ťažko"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Preskočiť"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrémne"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kliknutím na priblíženie"
 
-#~ msgid "Geography"
-#~ msgstr "Geografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Prezeráš"
 
-#~ msgid "Science"
-#~ msgstr "Veľkosť"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "od"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Ak chcete skontrolovať alebo odhaliť bunku/slovo, musíte najprv bunku vybrať"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Slovo (S) nebolo možné vložiť, prepáčte."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krížovka - hra"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Počet slov (upravený)"
 
-#~ msgid "Across"
-#~ msgstr "Naprieč"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Počet slov"
 
-#~ msgid "Down"
-#~ msgstr "Dole"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ďalej"
 
-#~ msgid "Reveal"
-#~ msgstr "Odhaliť"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Dokončili ste krížovku!"
 
-#~ msgid "Cell"
-#~ msgstr "Bunka"
-
-#~ msgid "Word"
-#~ msgstr "Slovo"
-
-#~ msgid "Grid"
-#~ msgstr "Mriežka"
-
-#~ msgid "Check"
-#~ msgstr "Skontrolujte"
-
-#~ msgid "Clear"
-#~ msgstr "jasný"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Preskočenie"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kliknutím na priblíženie"
+msgid "Easy"
+msgstr "Jednoduché"
 
-#~ msgid "You are viewing"
-#~ msgstr "Prezeráte si"
+msgid "Medium"
+msgstr "Stredná"
 
-#~ msgid "from"
-#~ msgstr "od"
+msgid "Hard"
+msgstr "Ťažko"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "slovo (slová) nebolo možné vložiť, prepáčte."
+msgid "Extreme"
+msgstr "Extrémne"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Počet slov (upravený)"
+msgid "Geography"
+msgstr "Geografia"
 
-#~ msgid "Word count"
-#~ msgstr "Počet slov"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "ďalej"
+msgid "Science"
+msgstr "Veda"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Dokončili ste krížovku!"
+msgid "Computer Science"
+msgstr "Počítačová veda"
diff --git a/crossword_puzzle/locales/sl/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sl/LC_MESSAGES/messages.mo
index 1a05dbc03..52c110a35 100644
Binary files a/crossword_puzzle/locales/sl/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sl/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sl/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sl/LC_MESSAGES/messages.po
index cfd216f25..62d9b6127 100644
--- a/crossword_puzzle/locales/sl/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sl <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Križanka"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Oglejte si križanke"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Zapustite aplikacijo"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globalne nastavitve"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Jeziki"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Velikost"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "svetloba"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "temno"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Videz"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "strašno"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "revni"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "povprečje"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Super"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "popoln"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kakovost križanja"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Brskalnik križank"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Pojdi nazaj"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Naloži križanko"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Odprite spletno aplikacijo"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Prekini spletno aplikacijo"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Nastavitve števila besed"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Izberite število besed"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Največ"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Po meri"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Če želite izvesti to operacijo, morate najprej izbrati celico."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Pogled"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Zapri"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "težavnost"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Skupaj besed"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Težavnost"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Izberite"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Ponovni zagon"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ali ste prepričani, da želite znova zagnati aplikacijo?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Izhod"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ali ste prepričani, da želite zapreti aplikacijo? Če se spletna aplikacija "
 "izvaja, bo prekinjena."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Nazaj domov"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ali ste prepričani, da se želite vrniti na začetni zaslon? Spletna "
 "aplikacija bo ukinjena."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Napaka"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ta jezik je že izbran."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ta velikost je že izbrana."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ta videz je že izbran."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ta kakovost je že izbrana."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informacije"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 " prek Activity Monitorja v sistemu MacOS ali preprosto znova zaženite "
 "računalnik, da jih prekinete."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "Podatki o osnovni križanki so dostopni le, če njene prevedene različice ni v"
 " imeniku področij."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Pri ustvarjanju križanke je prišlo do napake. Več informacij najdete v "
 "konzoli"
 
-msgid "Easy"
-msgstr "enostavno"
-
-msgid "Medium"
-msgstr "Srednje"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Križana uganka - igra"
 
-msgid "Hard"
-msgstr "težko"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Čez"
 
-msgid "Extreme"
-msgstr "Ekstremno"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Dol"
 
-msgid "Geography"
-msgstr "Geografija"
-
-msgid "Math"
-msgstr "matematika"
-
-msgid "Science"
-msgstr "Znanost"
-
-msgid "Computer Science"
-msgstr "Računalništvo"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Razkritje"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Celica"
 
-#~ msgid "Capitals"
-#~ msgstr "Prestolnice"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Beseda"
 
-#~ msgid "Countries"
-#~ msgstr "Države"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Mreža"
 
-#~ msgid "Easy"
-#~ msgstr "enostavno"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Preverite"
 
-#~ msgid "Medium"
-#~ msgstr "Srednje"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Jasno"
 
-#~ msgid "Hard"
-#~ msgstr "težko"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "SMART SKIP"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstremno"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kliknite za povečavo"
 
-#~ msgid "Geography"
-#~ msgstr "Geografija"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Gledate"
 
-#~ msgid "Science"
-#~ msgstr "Velikost"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "od"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Če želite preveriti ali razkriti celico/besedo, jo morate najprej izbrati"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Besede (-e) ni bilo mogoče vstaviti, oprosti."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Križanka - igra"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Število besed (prilagojeno)"
 
-#~ msgid "Across"
-#~ msgstr "Čez"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Število besed"
 
-#~ msgid "Down"
-#~ msgstr "Dol"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Nadaljujte"
 
-#~ msgid "Reveal"
-#~ msgstr "Razkrij"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Dokončali ste križanko!"
 
-#~ msgid "Cell"
-#~ msgstr "Celica"
-
-#~ msgid "Word"
-#~ msgstr "Beseda"
-
-#~ msgid "Grid"
-#~ msgstr "Mreža"
-
-#~ msgid "Check"
-#~ msgstr "Preverite"
-
-#~ msgid "Clear"
-#~ msgstr "jasno"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Pametni preskok"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kliknite za povečavo"
+msgid "Easy"
+msgstr "enostavno"
 
-#~ msgid "You are viewing"
-#~ msgstr "Gledate"
+msgid "Medium"
+msgstr "Srednje"
 
-#~ msgid "from"
-#~ msgstr "od"
+msgid "Hard"
+msgstr "težko"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "besede ni bilo mogoče vstaviti, žal."
+msgid "Extreme"
+msgstr "Ekstremno"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Število besed (prilagojeno)"
+msgid "Geography"
+msgstr "Geografija"
 
-#~ msgid "Word count"
-#~ msgstr "Število besed"
+msgid "Math"
+msgstr "matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Nadaljuj"
+msgid "Science"
+msgstr "Znanost"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Rešili ste križanko!"
+msgid "Computer Science"
+msgstr "Računalništvo"
diff --git a/crossword_puzzle/locales/sn/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sn/LC_MESSAGES/messages.mo
index caec8a7af..27be32526 100644
Binary files a/crossword_puzzle/locales/sn/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sn/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sn/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sn/LC_MESSAGES/messages.po
index ec15458a4..5bec5fd49 100644
--- a/crossword_puzzle/locales/sn/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sn/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sn <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "View crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Buda paapp"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Global Settings"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Mitauro"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Size"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "chiedza"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "rima"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "system"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Chitarisiko"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "zvinotyisa"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "murombo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "pakati"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "hukuru"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "kukwana"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Crossword mhando"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Dzokera"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Load crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Vhura web app"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Kumisa web app"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Sarudzo dzekuverenga mazwi"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Sarudza kuverenga kwemazwi"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Kuita izvi kushanda, iwe unofanirwa kutanga watanga kusarudza sero."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "View"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Close"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kuoma"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Mashoko ose"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dambudziko"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Sarudza"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Restart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Une chokwadi chekuti unoda kutangazve app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Exit"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Une chokwadi chekuti unoda kubuda muapp? Kana iyo webhu app iri kushanda, "
 "ichamiswa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Kudzokera kumba"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Une chokwadi chekuti unoda kudzokera kuchiratidziro chekumba? Webhu app "
 "ichamiswa."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Error"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Mutauro uyu wakatosarudzwa."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Saizi iyi yakatosarudzwa."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Chitarisiko ichi chakatosarudzwa."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Unhu uhwu hwatove wakasarudzwa."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "zvakanaka anogona kumiswa kuburikidza neAction Monitor paMacOS, kana, ingo "
 "tangazve komputa yako kuti uimise."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "CHERECHEDZA: Base crossword data inowanikwa chete kana shanduro yaro "
 "yakashandurwa isipo mudhairekitori renzvimbo."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Pane kukanganisa kwaitika mukugadzira mazwi. Ndokumbirawo uone rumwe ruzivo "
 "mune iyo console"
 
-msgid "Easy"
-msgstr "Easy"
-
-msgid "Medium"
-msgstr "Pakati"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - Game"
 
-msgid "Hard"
-msgstr "Zvakaoma"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Kuyambuka"
 
-msgid "Extreme"
-msgstr "Zvakanyanya"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Pasi"
 
-msgid "Geography"
-msgstr "Geography"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Sayenzi"
-
-msgid "Computer Science"
-msgstr "Computer Science"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ratidza"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sero"
 
-#~ msgid "Capitals"
-#~ msgstr "Capitals"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Izwi"
 
-#~ msgid "Countries"
-#~ msgstr "Nyika"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Easy"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Tarisa"
 
-#~ msgid "Medium"
-#~ msgstr "Pakati"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Bvisa"
 
-#~ msgid "Hard"
-#~ msgstr "Zvakaoma"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Zvakanyanya"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Dzvanya kuti Zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Urikuona"
 
-#~ msgid "Science"
-#~ msgstr "Size"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "kubva"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Kuti utarise kana kuratidza sero/izwi, unofanira kutanga wasarudza sero"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "izwi (s) dzaisakwanisa kuiswa, ndine urombo."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Mutambo"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kuverenga kweshoko (kugadziridzwa)"
 
-#~ msgid "Across"
-#~ msgstr "Mhiri"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Izwi kuverenga"
 
-#~ msgid "Down"
-#~ msgstr "Pasi"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Enderera"
 
-#~ msgid "Reveal"
-#~ msgstr "Ratidza"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Iwe wapedza chirevo chevhu!"
 
-#~ msgid "Cell"
-#~ msgstr "Sero"
-
-#~ msgid "Word"
-#~ msgstr "Shoko"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Check"
-
-#~ msgid "Clear"
-#~ msgstr "Pachena"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Dzvanya kuti Zoom"
+msgid "Easy"
+msgstr "Easy"
 
-#~ msgid "You are viewing"
-#~ msgstr "Uri kuona"
+msgid "Medium"
+msgstr "Pakati"
 
-#~ msgid "from"
-#~ msgstr "kubva"
+msgid "Hard"
+msgstr "Zvakaoma"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "izwi(ma)haana kukwanisa kuiswa,urombo."
+msgid "Extreme"
+msgstr "Zvakanyanya"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Kuverengwa kwemashoko (kwakagadziriswa)"
+msgid "Geography"
+msgstr "Geography"
 
-#~ msgid "Word count"
-#~ msgstr "Shoko kuverenga"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Enderera mberi"
+msgid "Science"
+msgstr "Sayenzi"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Iwe wapedza crossword!"
+msgid "Computer Science"
+msgstr "Computer Science"
diff --git a/crossword_puzzle/locales/so/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/so/LC_MESSAGES/messages.mo
index c83cddd39..06f0d478a 100644
Binary files a/crossword_puzzle/locales/so/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/so/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/so/LC_MESSAGES/messages.po b/crossword_puzzle/locales/so/LC_MESSAGES/messages.po
index 7dbee7a3a..0d88037b8 100644
--- a/crossword_puzzle/locales/so/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/so/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: so <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Halxiraalaha Ereyga"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Eeg ereyada isdhaafka ah"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ka bax abka"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Goobaha Caalamiga ah"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Luuqadaha"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Cabbirka"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "iftiin"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "madow"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "nidaamka"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Muuqashada"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "aad u daran"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "fakhri ah"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "dhexdhexaad ah"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "weyn"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "fiican"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Tayada ereyga"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Browser-ka-hadalka"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Dib ugu noqo"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Soo rar kelmadda isdhaafka"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Fur shabakada internetka"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Jooji abka shabakada"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Dookhyada tirinta kelmadda"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Dooro tirinta kelmadda"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Ugu badnaan"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Caadiyan"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Si aad u fuliso howshaan, waa inaad marka hore doorataa unug."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Daawo"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Xir"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "dhib"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Wadarta erayada"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Dhib"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Dooro"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Dib u bilow"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ma hubtaa inaad rabto inaad dib u bilowdo abka?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Ka bax"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ma hubtaa inaad doonayso inaad ka baxdo abka? Haddii abka webku uu socdo, "
 "waa la joojin doonaa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Ku noqo guriga"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ma hubtaa inaad doonayso inaad ku laabato shaashadda guriga? Abka shabakada "
 "waa la joojin doonaa"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Khalad"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Luqadan mar hore ayaa la doortay."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Xajmigan mar hore ayaa la doortay."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Muuqaalkan mar hore ayaa la doortay."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Tayadan mar hore ayaa la doortay."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Xog"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "joojin karaa iyada oo loo marayo Kormeerka Hawsha ee MacOS, ama, si fudud "
 "dib u bilaw kombiyuutarkaaga si aad u joojiso."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "AH: Xogta kelmadda sal-ku-galka ah waxa la galaa kaliya marka nooca la "
 "turjumay aanu ku jirin tusaha xaafadaha."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,118 +239,104 @@ msgstr ""
 "Khalad ayaa ka dhacay jiilka ereyada isdhaafka ah. Fadlan ka eeg macluumaad "
 "dheeraad ah console-ka"
 
-msgid "Easy"
-msgstr "Fudud"
-
-msgid "Medium"
-msgstr "Dhexdhexaad"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Hal-abuurka ereyga - ciyaarta"
 
-msgid "Hard"
-msgstr "Adag"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Ka gudbid"
 
-msgid "Extreme"
-msgstr "Aad u daran"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Hoose"
 
-msgid "Geography"
-msgstr "Juqraafiga"
-
-msgid "Math"
-msgstr "Xisaab"
-
-msgid "Science"
-msgstr "Sayniska"
-
-msgid "Computer Science"
-msgstr "Sayniska Kombiyuutarka"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Muujin"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Unug"
 
-#~ msgid "Capitals"
-#~ msgstr "Caasimadaha"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Erey"
 
-#~ msgid "Countries"
-#~ msgstr "Wadamada"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Shiirid"
 
-#~ msgid "Easy"
-#~ msgstr "Fudud"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Hubin"
 
-#~ msgid "Medium"
-#~ msgstr "Dhexdhexaad"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Waadixin ah"
 
-#~ msgid "Hard"
-#~ msgstr "Adag"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Swip Smart"
 
-#~ msgid "Extreme"
-#~ msgstr "Aad u daran"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Guji si aad u weyso"
 
-#~ msgid "Geography"
-#~ msgstr "Juqraafiga"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Waad fiirineysaa"
 
-#~ msgid "Science"
-#~ msgstr "Cabbirka"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ka"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Si loo hubiyo ama loo muujiyo unug/erey, waa inaad marka hore doorataa unug"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ereyga (yaasha) lama galin karo, waan ka xumahay."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Halxiraalaha Ereyga-Ciyaarta"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Tirinta ereyga (la hagaajiyay)"
 
-#~ msgid "Across"
-#~ msgstr "Dhanka kale"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Ereyga tirinta"
 
-#~ msgid "Down"
-#~ msgstr "Hoos"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Socon"
 
-#~ msgid "Reveal"
-#~ msgstr "Muujin"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Waxaad dhammaystirtay ereyga iskutallaabta!"
 
-#~ msgid "Cell"
-#~ msgstr "Unug"
-
-#~ msgid "Word"
-#~ msgstr "Eray"
-
-#~ msgid "Grid"
-#~ msgstr "Xarig"
-
-#~ msgid "Check"
-#~ msgstr "Hubi"
-
-#~ msgid "Clear"
-#~ msgstr "Cad"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Swip Smart"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Guji si aad u weyso"
+msgid "Easy"
+msgstr "Fudud"
 
-#~ msgid "You are viewing"
-#~ msgstr "Waad daawanaysaa"
+msgid "Medium"
+msgstr "Dhexdhexaad"
 
-#~ msgid "from"
-#~ msgstr "ka"
+msgid "Hard"
+msgstr "Adag"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "kelmad lama gelin karo, waan ka xumahay."
+msgid "Extreme"
+msgstr "Aad u daran"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Tirada kelmadda (la hagaajiyay)"
+msgid "Geography"
+msgstr "Juqraafiga"
 
-#~ msgid "Word count"
-#~ msgstr "Tirada erayada"
+msgid "Math"
+msgstr "Xisaab"
 
-#~ msgid "Continue"
-#~ msgstr "Sii wad"
+msgid "Science"
+msgstr "Sayniska"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Waxaad dhammaysay is-dhaafsiga!"
+msgid "Computer Science"
+msgstr "Sayniska Kombiyuutarka"
diff --git a/crossword_puzzle/locales/sq/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sq/LC_MESSAGES/messages.mo
index 584f8e30c..db962d272 100644
Binary files a/crossword_puzzle/locales/sq/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sq/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sq/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sq/LC_MESSAGES/messages.po
index bdbe03468..e19d1208a 100644
--- a/crossword_puzzle/locales/sq/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sq/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sq <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Fjalekryq"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Shikoni fjalëkryqet"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Dilni nga aplikacioni"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Parametrat globale"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Gjuhët"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Madhësia"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "dritë"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "errët"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistemi"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Pamja e jashtme"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "i tmerrshëm"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "i varfër"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "mesatare"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "i madh"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "i përkryer"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Cilësia e fjalëkryqit"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Shfletuesi i fjalëkryqeve"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Kthehu mbrapa"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Ngarko fjalëkryq"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Hap aplikacionin në internet"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Përfundoni aplikacionin në internet"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferencat e numrit të fjalëve"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Zgjidhni numrin e fjalëve"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimumi"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Me porosi"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Për të kryer këtë operacion, së pari duhet të zgjidhni një qelizë."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Pamje"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Mbylle"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "vështirësi"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Gjithsej fjalë"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Vështirësi"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Zgjidhni"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Rifillo, fillo përsëri"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Jeni i sigurt që dëshironi të rinisni aplikacionin?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Dilni"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Je i sigurt që dëshiron të dalësh nga aplikacioni? Nëse aplikacioni i uebit "
 "po funksionon, ai do të mbyllet."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Përsëri në shtëpi"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Jeni i sigurt që dëshironi të ktheheni në ekranin bazë? Aplikacioni i uebit "
 "do të mbyllet."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Gabim"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Kjo gjuhë është zgjedhur tashmë."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Kjo madhësi është zgjedhur tashmë."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Kjo pamje është përzgjedhur tashmë."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kjo cilësi është zgjedhur tashmë."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Informacion"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 "aktivitetit në MacOS ose thjesht rinisni kompjuterin tuaj për t'i përfunduar"
 " ato."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "bazë cwords. SHËNIM: Të dhënat bazë të fjalëkryqit aksesohen vetëm kur "
 "versioni i përkthyer i tyre nuk është i pranishëm në direktorinë e lokaleve."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Ndodhi një gabim në gjenerimin e fjalëkryqit. Ju lutemi shikoni informacione"
 " të mëtejshme në tastierë"
 
-msgid "Easy"
-msgstr "Lehtë"
-
-msgid "Medium"
-msgstr "E mesme"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Puzzle Fjalëkuqe - Lojë"
 
-msgid "Hard"
-msgstr "E vështirë"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Përtej"
 
-msgid "Extreme"
-msgstr "Ekstreme"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Poshtë"
 
-msgid "Geography"
-msgstr "Gjeografia"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Shkenca"
-
-msgid "Computer Science"
-msgstr "Shkenca Kompjuterike"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Zbuloj"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Qeli"
 
-#~ msgid "Capitals"
-#~ msgstr "Kapitale"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Fjalë"
 
-#~ msgid "Countries"
-#~ msgstr "shtetet"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rrjet"
 
-#~ msgid "Easy"
-#~ msgstr "Lehtë"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrolloj"
 
-#~ msgid "Medium"
-#~ msgstr "E mesme"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Qartë"
 
-#~ msgid "Hard"
-#~ msgstr "E vështirë"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Kalim i zgjuar"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstreme"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klikoni për të zmadhuar"
 
-#~ msgid "Geography"
-#~ msgstr "Gjeografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Ju jeni duke parë"
 
-#~ msgid "Science"
-#~ msgstr "Madhësia"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "nga"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Për të kontrolluar ose zbuluar një qelizë/fjalë, fillimisht duhet të "
-#~ "zgjidhni një qelizë"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Fjala (et) nuk mund të futet, më fal."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Fjalëkryq Puzzle - Lojë"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Numërimi i fjalëve (i rregulluar)"
 
-#~ msgid "Across"
-#~ msgstr "Përtej"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Numërim i fjalëve"
 
-#~ msgid "Down"
-#~ msgstr "Poshtë"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Vazhdoj"
 
-#~ msgid "Reveal"
-#~ msgstr "Zbuloni"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "E keni përfunduar fjalëkryqin!"
 
-#~ msgid "Cell"
-#~ msgstr "Qelizë"
-
-#~ msgid "Word"
-#~ msgstr "fjalë"
-
-#~ msgid "Grid"
-#~ msgstr "Rrjeti"
-
-#~ msgid "Check"
-#~ msgstr "Kontrollo"
-
-#~ msgid "Clear"
-#~ msgstr "Qartë"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Kalim i zgjuar"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klikoni për të zmadhuar"
+msgid "Easy"
+msgstr "Lehtë"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ju jeni duke parë"
+msgid "Medium"
+msgstr "E mesme"
 
-#~ msgid "from"
-#~ msgstr "nga"
+msgid "Hard"
+msgstr "E vështirë"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "fjala(at) nuk mund të futej, më falni."
+msgid "Extreme"
+msgstr "Ekstreme"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Numri i fjalëve (i rregulluar)"
+msgid "Geography"
+msgstr "Gjeografia"
 
-#~ msgid "Word count"
-#~ msgstr "Numërimi i fjalëve"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Vazhdoni"
+msgid "Science"
+msgstr "Shkenca"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "E plotësove fjalëkryqin!"
+msgid "Computer Science"
+msgstr "Shkenca Kompjuterike"
diff --git a/crossword_puzzle/locales/sr/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sr/LC_MESSAGES/messages.mo
index 7ef1e2f6a..627cae23f 100644
Binary files a/crossword_puzzle/locales/sr/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sr/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sr/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sr/LC_MESSAGES/messages.po
index 76a3328c1..9479250d2 100644
--- a/crossword_puzzle/locales/sr/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sr <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Укрштене речи"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Погледајте укрштене речи"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Изађите из апликације"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобална подешавања"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Језици"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Величина"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "светлости"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "мрачно"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "система"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Изглед"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "страшан"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "сиромашан"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "просек"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "велики"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "савршен"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Укрштени квалитет"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Претраживач укрштених речи"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Вратити се"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Учитај укрштеницу"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Отворите веб апликацију"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Прекините веб апликацију"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Подешавања броја речи"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Изаберите број речи"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максимум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Обичај"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Да бисте извршили ову операцију, прво морате да изаберете ћелију."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Поглед"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Близу"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "тешкоћа"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Укупно речи"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Потешкоће"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Изаберите"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Поново покренути"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Да ли сте сигурни да желите да поново покренете апликацију?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Изађи"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Да ли сте сигурни да желите да изађете из апликације? Ако је веб апликација "
 "покренута, биће прекинута."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Назад кући"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Да ли сте сигурни да желите да се вратите на почетни екран? Веб апликација "
 "ће бити прекинута."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Грешка"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Овај језик је већ изабран."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ова величина је већ изабрана."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Овај изглед је већ изабран."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Овај квалитет је већ изабран."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Инфо"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 "који нису правилно прекинути могу се прекинути преко Ацтивити Монитор-а на "
 "МацОС-у или једноставно поново покрените рачунар да бисте их прекинули."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -237,7 +229,7 @@ msgstr ""
 "НАПОМЕНА: Основним подацима укрштених речи приступа се само када њихова "
 "преведена верзија није присутна у директоријуму локалних језика."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -245,118 +237,104 @@ msgstr ""
 "Дошло је до грешке при генерисању укрштених речи. Молимо погледајте додатне "
 "информације у конзоли"
 
-msgid "Easy"
-msgstr "Лако"
-
-msgid "Medium"
-msgstr "Средње"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Цроссворд Пуззле - Гаме"
 
-msgid "Hard"
-msgstr "Тешко"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Преко"
 
-msgid "Extreme"
-msgstr "Екстремно"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Надиграти се"
 
-msgid "Geography"
-msgstr "Географија"
-
-msgid "Math"
-msgstr "Матх"
-
-msgid "Science"
-msgstr "Наука"
-
-msgid "Computer Science"
-msgstr "Информатика"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Открити"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ћелија"
 
-#~ msgid "Capitals"
-#~ msgstr "Капитали"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Реч"
 
-#~ msgid "Countries"
-#~ msgstr "Земље"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Мрежа"
 
-#~ msgid "Easy"
-#~ msgstr "Лако"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Проверавати"
 
-#~ msgid "Medium"
-#~ msgstr "Средње"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Јасно"
 
-#~ msgid "Hard"
-#~ msgstr "Тешко"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Смарт Скип"
 
-#~ msgid "Extreme"
-#~ msgstr "Екстремно"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Кликните за увећање"
 
-#~ msgid "Geography"
-#~ msgstr "Географија"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Гледате"
 
-#~ msgid "Science"
-#~ msgstr "Величина"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "од"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Да бисте проверили или открили ћелију/реч, прво морате да изаберете ћелију"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Реч (и) нису могле да се убацују, извини."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Укрштеница - игра"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Број речи (подешено)"
 
-#~ msgid "Across"
-#~ msgstr "Преко"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Број речи"
 
-#~ msgid "Down"
-#~ msgstr "Доле"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Настави"
 
-#~ msgid "Reveal"
-#~ msgstr "Откриј"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Завршили сте укрштену реч!"
 
-#~ msgid "Cell"
-#~ msgstr "Ћелија"
-
-#~ msgid "Word"
-#~ msgstr "Реч"
-
-#~ msgid "Grid"
-#~ msgstr "Грид"
-
-#~ msgid "Check"
-#~ msgstr "Проверавати"
-
-#~ msgid "Clear"
-#~ msgstr "Јасно"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Смарт Скип"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Кликните за увећање"
+msgid "Easy"
+msgstr "Лако"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ви гледате"
+msgid "Medium"
+msgstr "Средње"
 
-#~ msgid "from"
-#~ msgstr "из"
+msgid "Hard"
+msgstr "Тешко"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "није могуће уметнути реч(е), извини."
+msgid "Extreme"
+msgstr "Екстремно"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Број речи (прилагођено)"
+msgid "Geography"
+msgstr "Географија"
 
-#~ msgid "Word count"
-#~ msgstr "Број речи"
+msgid "Math"
+msgstr "Матх"
 
-#~ msgid "Continue"
-#~ msgstr "Настави"
+msgid "Science"
+msgstr "Наука"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Завршили сте укрштеницу!"
+msgid "Computer Science"
+msgstr "Информатика"
diff --git a/crossword_puzzle/locales/st/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/st/LC_MESSAGES/messages.mo
index ae830c52e..600298123 100644
Binary files a/crossword_puzzle/locales/st/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/st/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/st/LC_MESSAGES/messages.po b/crossword_puzzle/locales/st/LC_MESSAGES/messages.po
index 58e56d427..fd000e846 100644
--- a/crossword_puzzle/locales/st/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/st/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: st <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Phapanyetsano ea Mantsoe"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Sheba li-crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Tsoa ho app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Litlhophiso tsa Global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Lipuo"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Boholo"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "kganya"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "lefifi"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "tsamaiso"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ponahalo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "e mpe"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "mafutsana"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "Karolelano"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "e kholo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "E phethahetseng"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Boleng ba mantsoe"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Leba morao"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Kenya mantsoe a fapaneng"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Bula sesebelisoa sa tepo"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Emisa sesebelisoa sa marang-rang"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Likhetho tsa palo ea mantsoe"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Khetha palo ea mantsoe"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Boholo"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Tloaelo"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Ho etsa ts'ebetso ena, o tlameha ho khetha sele."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Sheba"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Koala"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "bothata"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Kakaretso ea mantsoe"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Bothata"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Khetha"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Qala hape"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Na ehlile u batla ho qala sesebelisoa hape?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Etsoa"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Na ehlile u batla ho tsoa ho app? Haeba sesebelisoa sa marang-rang se ntse "
 "se sebetsa, se tla emisoa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Khutlela hae"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Na ehlile u batla ho khutlela skrineng sa lapeng? Sesebelisoa sa Marang-rang"
 " se tla emisoa."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Phoso"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Puo ena e se e khethiloe."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Boholo bona bo se bo khethiloe."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ponahalo ena e se e khethiloe."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Boleng bona bo se bo khethiloe."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 " Lits'ebetso tsohle tsa app tse sa kang tsa felisoa ka nepo li ka felisoa ka"
 " Activity Monitor ho MacOS, kapa, feela qala komporo ea hau hape ho e emisa."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "cwords\". HLOKOMELA: Lintlha tsa motheo tsa mantsoe li fumaneha feela ha "
 "phetolelo ea eona e le sieo bukeng ea libaka."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Phoso e etsahetse tlhahisong ea mantsoe. Ka kopo bona lintlha tse ling ho "
 "console"
 
-msgid "Easy"
-msgstr "Bonolo"
-
-msgid "Medium"
-msgstr "Mahareng"
-
-msgid "Hard"
-msgstr "E thata"
-
-msgid "Extreme"
-msgstr "Feteletseng"
-
-msgid "Geography"
-msgstr "Geography"
-
-msgid "Math"
-msgstr "Lipalo"
-
-msgid "Science"
-msgstr "Saense"
-
-msgid "Computer Science"
-msgstr "Mahlale a likomporo"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Li-capital"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Pozzle - papali"
 
-#~ msgid "Countries"
-#~ msgstr "Linaha"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Ka nako"
 
-#~ msgid "Easy"
-#~ msgstr "Bonolo"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Tlase"
 
-#~ msgid "Medium"
-#~ msgstr "Mahareng"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Senola"
 
-#~ msgid "Hard"
-#~ msgstr "E thata"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sele"
 
-#~ msgid "Extreme"
-#~ msgstr "Feteletseng"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Lentsoe"
 
-#~ msgid "Geography"
-#~ msgstr "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Science"
-#~ msgstr "Boholo"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Lekola"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Ho hlahloba kapa ho senola sele/lentswe, o tlameha ho qala ka ho kgetha sele"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Hlakisa"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Papali"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Across"
-#~ msgstr "Ka nqane"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Tobetsa ho Zoom"
 
-#~ msgid "Down"
-#~ msgstr "Tlase"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "O shebile"
 
-#~ msgid "Reveal"
-#~ msgstr "Senola"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ho tloha"
 
-#~ msgid "Cell"
-#~ msgstr "Sele"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Mantsoe (a) a ka se ke a kenngoa, masoabi."
 
-#~ msgid "Word"
-#~ msgstr "Lentsoe"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Lipalo tsa mantsoe (tse fetotsoeng)"
 
-#~ msgid "Grid"
-#~ msgstr "Grid"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Palo ea mantsoe"
 
-#~ msgid "Check"
-#~ msgstr "Hlahloba"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Tsoela pele"
 
-#~ msgid "Clear"
-#~ msgstr "Hlakileng"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "U qetile mantsoe a sefapano!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Tobetsa ho Zoom"
+msgid "Easy"
+msgstr "Bonolo"
 
-#~ msgid "You are viewing"
-#~ msgstr "U ntse u shebile"
+msgid "Medium"
+msgstr "Mahareng"
 
-#~ msgid "from"
-#~ msgstr "ho tloha"
+msgid "Hard"
+msgstr "E thata"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "(ma) mantsoe ha a khone ho kenngoa, masoabi."
+msgid "Extreme"
+msgstr "Feteletseng"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Palo ea mantsoe (e fetotsoe)"
+msgid "Geography"
+msgstr "Geography"
 
-#~ msgid "Word count"
-#~ msgstr "Palo ea mantsoe"
+msgid "Math"
+msgstr "Lipalo"
 
-#~ msgid "Continue"
-#~ msgstr "Tsoela pele"
+msgid "Science"
+msgstr "Saense"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "U qetile mantsoe a fapaneng!"
+msgid "Computer Science"
+msgstr "Mahlale a likomporo"
diff --git a/crossword_puzzle/locales/su/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/su/LC_MESSAGES/messages.mo
index 4d88d209a..74fa3d82e 100644
Binary files a/crossword_puzzle/locales/su/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/su/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/su/LC_MESSAGES/messages.po b/crossword_puzzle/locales/su/LC_MESSAGES/messages.po
index f06872814..c74a18e23 100644
--- a/crossword_puzzle/locales/su/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/su/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: su <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Teka-teki silang"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Témbongkeun crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Kaluar tina aplikasi"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Setélan Global"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Basa"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Ukuran"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "cahayaan"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "poek"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Penampilan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "pikasieuneun"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "malarat"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "rata-rata"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "hebat"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "sampurna"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kualitas silang"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Uih deui"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Ngamuat crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Buka aplikasi wéb"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Pareuman aplikasi wéb"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferensi cacah kecap"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pilih jumlah kecap"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "maksimal"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Adat"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Pikeun ngalakukeun operasi ieu, anjeun kedah milih sél."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Témbongkeun"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Tutup"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kasusah"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Jumlah kecap"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Kasusah"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pilih"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Uihan deui"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Naha anjeun yakin hoyong ngabalikan deui aplikasi?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Kaluar"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Naha anjeun yakin hoyong kaluar tina aplikasi? Upami aplikasi wéb "
 "dijalankeun, éta bakal dileungitkeun."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Balik ka imah"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Naha anjeun yakin rék balik deui ka layar utama? Aplikasi wéb bakal "
 "dipareuman."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Kasalahan"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Basa ieu geus dipilih."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ukuran ieu geus dipilih."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Penampilan ieu parantos dipilih."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Kualitas ieu parantos dipilih."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Inpo"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "Monitor dina MacOS, atanapi, ngan saukur balikan deui komputer anjeun pikeun"
 " ngeureunkeunana."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "definisina aya dina diréktori cwords dasar. CATETAN: Data crossword dasar "
 "ngan diaksés nalika versi tarjamah na teu aya dina diréktori lokal."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,118 +238,104 @@ msgstr ""
 "Kasalahan lumangsung dina generasi crossword. Mangga tingali informasi "
 "salajengna dina konsol nu"
 
-msgid "Easy"
-msgstr "gampil"
-
-msgid "Medium"
-msgstr "Sedeng"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Teka-teki silang - patandingan"
 
-msgid "Hard"
-msgstr "Teuas"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Meuntas"
 
-msgid "Extreme"
-msgstr "Ekstrim"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Turun"
 
-msgid "Geography"
-msgstr "Géografi"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Élmu"
-
-msgid "Computer Science"
-msgstr "Ilmu komputer"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ngungkabkeun"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Sél"
 
-#~ msgid "Capitals"
-#~ msgstr "Ibukota"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Kecap"
 
-#~ msgid "Countries"
-#~ msgstr "Nagara-nagara"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Gram gram grid"
 
-#~ msgid "Easy"
-#~ msgstr "gampil"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Pariksa"
 
-#~ msgid "Medium"
-#~ msgstr "Sedeng"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Jelas"
 
-#~ msgid "Hard"
-#~ msgstr "Teuas"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Luncat pinter"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstrim"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Pencét pikeun ngazum"
 
-#~ msgid "Geography"
-#~ msgstr "Géografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Anjeun ningali"
 
-#~ msgid "Science"
-#~ msgstr "Ukuran"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "tina"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Pikeun mariksa atanapi nembongkeun sél/kecap, anjeun kedah milih sél heula"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "kecap (s) teu tiasa diselapkeun, punten."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Kaulinan"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kecap-kecap (disaluyukeun)"
 
-#~ msgid "Across"
-#~ msgstr "Meuntas"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Cacah Kecap"
 
-#~ msgid "Down"
-#~ msgstr "Turun"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Nuluykeun"
 
-#~ msgid "Reveal"
-#~ msgstr "Nyilakakeun"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Anjeun réngsé crossword!"
 
-#~ msgid "Cell"
-#~ msgstr "Sél"
-
-#~ msgid "Word"
-#~ msgstr "Kecap"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Cék"
-
-#~ msgid "Clear"
-#~ msgstr "Jelas"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Luncat pinter"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Pencét pikeun ngazum"
+msgid "Easy"
+msgstr "gampil"
 
-#~ msgid "You are viewing"
-#~ msgstr "Anjeun keur nempo"
+msgid "Medium"
+msgstr "Sedeng"
 
-#~ msgid "from"
-#~ msgstr "ti"
+msgid "Hard"
+msgstr "Teuas"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "kecap (s) teu bisa diselapkeun, punten."
+msgid "Extreme"
+msgstr "Ekstrim"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Jumlah kecap (disaluyukeun)"
+msgid "Geography"
+msgstr "Géografi"
 
-#~ msgid "Word count"
-#~ msgstr "Jumlah kecap"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Teraskeun"
+msgid "Science"
+msgstr "Élmu"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Anjeun ngalengkepan crossword!"
+msgid "Computer Science"
+msgstr "Ilmu komputer"
diff --git a/crossword_puzzle/locales/sv/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sv/LC_MESSAGES/messages.mo
index 7f1413890..11607905f 100644
Binary files a/crossword_puzzle/locales/sv/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sv/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sv/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sv/LC_MESSAGES/messages.po
index 405e04bd7..89b389b76 100644
--- a/crossword_puzzle/locales/sv/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sv/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sv <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Korsord"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Se korsord"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Avsluta appen"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Globala inställningar"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "språk"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Storlek"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ljus"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mörk"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "systemet"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Utseende"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "fruktansvärd"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "fattig"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "genomsnitt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "bra"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perfekt"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Korsordskvalitet"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Korsordsläsare"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Gå tillbaka"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Ladda korsord"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Öppna webbappen"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Avsluta webbappen"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Preferenser för antal ord"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Välj antal ord"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maximal"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Beställnings"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "För att utföra denna operation måste du först välja en cell."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Se"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Stänga"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "svårighet"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Totalt antal ord"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Svårighet"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Välj"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Omstart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Är du säker på att du vill starta om appen?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Utgång"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Är du säker på att du vill avsluta appen? Om webbappen körs kommer den att "
 "avslutas."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Tillbaka till hemmet"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Är du säker på att du vill gå tillbaka till startskärmen? Webbappen kommer "
 "att avslutas."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Fel"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Det här språket är redan valt."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Denna storlek är redan vald."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Detta utseende är redan valt."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Denna kvalitet är redan vald."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Info"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -225,7 +217,7 @@ msgstr ""
 " inte har avslutats korrekt kan avslutas via Activity Monitor på MacOS, "
 "eller helt enkelt starta om din dator för att avsluta dem."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -236,7 +228,7 @@ msgstr ""
 "dess definitions-JSON-fil finns i baskatalogen cwords. OBS: Baskorsordsdata "
 "nås endast när dess översatta version inte finns i språkkatalogen."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -244,118 +236,104 @@ msgstr ""
 "Ett fel uppstod i korsordsgenereringen. Se ytterligare information i "
 "konsolen"
 
-msgid "Easy"
-msgstr "Lätt"
-
-msgid "Medium"
-msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Korsord - spel"
 
-msgid "Hard"
-msgstr "Hård"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Tvärs över"
 
-msgid "Extreme"
-msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ner"
 
-msgid "Geography"
-msgstr "Geografi"
-
-msgid "Math"
-msgstr "Matematik"
-
-msgid "Science"
-msgstr "Vetenskap"
-
-msgid "Computer Science"
-msgstr "Datavetenskap"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Avslöja"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cell"
 
-#~ msgid "Capitals"
-#~ msgstr "versaler"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Ord"
 
-#~ msgid "Countries"
-#~ msgstr "Länder"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Rutnät"
 
-#~ msgid "Easy"
-#~ msgstr "Lätt"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kolla upp"
 
-#~ msgid "Medium"
-#~ msgstr "Medium"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Klar"
 
-#~ msgid "Hard"
-#~ msgstr "Hård"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart hoppa över"
 
-#~ msgid "Extreme"
-#~ msgstr "Extrem"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Klicka för att zooma"
 
-#~ msgid "Geography"
-#~ msgstr "Geografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Du tittar på"
 
-#~ msgid "Science"
-#~ msgstr "Storlek"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "från"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "För att kontrollera eller avslöja en cell/ord måste du först markera en cell"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ord (er) kunde inte sättas in, förlåt."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Korsord - Spel"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Word Count (justerat)"
 
-#~ msgid "Across"
-#~ msgstr "Tvärs över"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Antal ord"
 
-#~ msgid "Down"
-#~ msgstr "Ner"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Fortsätta"
 
-#~ msgid "Reveal"
-#~ msgstr "Avslöja"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Du slutförde korsordet!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "Ord"
-
-#~ msgid "Grid"
-#~ msgstr "Rutnät"
-
-#~ msgid "Check"
-#~ msgstr "Kolla upp"
-
-#~ msgid "Clear"
-#~ msgstr "Klar"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart hoppa över"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Klicka för att zooma"
+msgid "Easy"
+msgstr "Lätt"
 
-#~ msgid "You are viewing"
-#~ msgstr "Du tittar"
+msgid "Medium"
+msgstr "Medium"
 
-#~ msgid "from"
-#~ msgstr "från"
+msgid "Hard"
+msgstr "Hård"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Det gick inte att infoga ord, tyvärr."
+msgid "Extreme"
+msgstr "Extrem"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Antal ord (justerat)"
+msgid "Geography"
+msgstr "Geografi"
 
-#~ msgid "Word count"
-#~ msgstr "Antal ord"
+msgid "Math"
+msgstr "Matematik"
 
-#~ msgid "Continue"
-#~ msgstr "Fortsätta"
+msgid "Science"
+msgstr "Vetenskap"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Du klarade korsordet!"
+msgid "Computer Science"
+msgstr "Datavetenskap"
diff --git a/crossword_puzzle/locales/sw/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/sw/LC_MESSAGES/messages.mo
index a0bddc2ad..6b1158918 100644
Binary files a/crossword_puzzle/locales/sw/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/sw/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/sw/LC_MESSAGES/messages.po b/crossword_puzzle/locales/sw/LC_MESSAGES/messages.po
index 548c564c9..76c5e6357 100644
--- a/crossword_puzzle/locales/sw/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/sw/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: sw <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Fumbo la maneno"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Tazama maneno mseto"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ondoka kwenye programu"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Mipangilio ya Ulimwenguni"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Lugha"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Ukubwa"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "mwanga"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "giza"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "mfumo"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Mwonekano"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ya kutisha"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "maskini"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "wastani"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "kubwa"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "Kamili"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ubora wa maneno"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Kivinjari cha Maneno"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Rudi nyuma"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Pakia neno mseto"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Fungua programu ya wavuti"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Sitisha programu ya wavuti"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Mapendeleo ya kuhesabu maneno"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Chagua hesabu ya maneno"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Upeo wa juu"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Desturi"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Ili kufanya operesheni hii, lazima kwanza uchague kiini."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Tazama"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Funga"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ugumu"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Jumla ya maneno"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Ugumu"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Chagua"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Anzisha tena"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Je, una uhakika unataka kuanzisha upya programu?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Utgång"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Je, una uhakika unataka kuondoka kwenye programu? Ikiwa programu ya wavuti "
 "inaendeshwa, itasitishwa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Rudi nyumbani"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Je, una uhakika unataka kurudi kwenye skrini ya kwanza? Programu ya wavuti "
 "itakatishwa."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Hitilafu"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Lugha hii tayari imechaguliwa."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ukubwa huu tayari umechaguliwa."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Mwonekano huu tayari umechaguliwa."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ubora huu tayari umechaguliwa."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Habari"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "ambayo haijakatishwa ipasavyo inaweza kusitishwa kupitia Kifuatiliaji cha "
 "Shughuli kwenye MacOS, au, anzisha upya kompyuta yako ili kuizima."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "ya maneno. KUMBUKA: Data ya maneno msingi hupatikana tu wakati toleo lake "
 "lililotafsiriwa halipo kwenye saraka ya lugha."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,117 +238,104 @@ msgstr ""
 "Hitilafu imetokea katika utengenezaji wa maneno mtambuka. Tafadhali tazama "
 "maelezo zaidi kwenye koni"
 
-msgid "Easy"
-msgstr "Rahisi"
-
-msgid "Medium"
-msgstr "Kati"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - Mchezo"
 
-msgid "Hard"
-msgstr "Ngumu"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Kote"
 
-msgid "Extreme"
-msgstr "Uliokithiri"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Chini"
 
-msgid "Geography"
-msgstr "Jiografia"
-
-msgid "Math"
-msgstr "Hisabati"
-
-msgid "Science"
-msgstr "Sayansi"
-
-msgid "Computer Science"
-msgstr "Sayansi ya Kompyuta"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Onyesha"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Seli"
 
-#~ msgid "Capitals"
-#~ msgstr "Miji mikuu"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Neno"
 
-#~ msgid "Countries"
-#~ msgstr "Nchi"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Gridi ya taifa"
 
-#~ msgid "Easy"
-#~ msgstr "Rahisi"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Angalia"
 
-#~ msgid "Medium"
-#~ msgstr "Kati"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Wazi"
 
-#~ msgid "Hard"
-#~ msgstr "Ngumu"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Uliokithiri"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Bonyeza kwa Zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Jiografia"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Unaangalia"
 
-#~ msgid "Science"
-#~ msgstr "Ukubwa"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "kutoka"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Kuangalia au kufichua seli/neno, lazima kwanza uchague seli"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Neno (s) halikuweza kuingizwa, samahani."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Mafumbo ya Maneno - Mchezo"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Hesabu ya maneno (iliyorekebishwa)"
 
-#~ msgid "Across"
-#~ msgstr "Kuvuka"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Hesabu ya maneno"
 
-#~ msgid "Down"
-#~ msgstr "Chini"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Endelea"
 
-#~ msgid "Reveal"
-#~ msgstr "Onyesha"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ulikamilisha neno la msalaba!"
 
-#~ msgid "Cell"
-#~ msgstr "Kiini"
-
-#~ msgid "Word"
-#~ msgstr "Neno"
-
-#~ msgid "Grid"
-#~ msgstr "Gridi"
-
-#~ msgid "Check"
-#~ msgstr "Angalia"
-
-#~ msgid "Clear"
-#~ msgstr "Wazi"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Bonyeza kwa Zoom"
+msgid "Easy"
+msgstr "Rahisi"
 
-#~ msgid "You are viewing"
-#~ msgstr "Unatazama"
+msgid "Medium"
+msgstr "Kati"
 
-#~ msgid "from"
-#~ msgstr "kutoka"
+msgid "Hard"
+msgstr "Ngumu"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "neno(ma)haikuweza kuingizwa, samahani."
+msgid "Extreme"
+msgstr "Uliokithiri"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Idadi ya maneno (iliyorekebishwa)"
+msgid "Geography"
+msgstr "Jiografia"
 
-#~ msgid "Word count"
-#~ msgstr "Idadi ya maneno"
+msgid "Math"
+msgstr "Hisabati"
 
-#~ msgid "Continue"
-#~ msgstr "Endelea"
+msgid "Science"
+msgstr "Sayansi"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Umekamilisha neno mseto!"
+msgid "Computer Science"
+msgstr "Sayansi ya Kompyuta"
diff --git a/crossword_puzzle/locales/ta/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/ta/LC_MESSAGES/messages.mo
index 617d21951..216fc7441 100644
Binary files a/crossword_puzzle/locales/ta/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/ta/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/ta/LC_MESSAGES/messages.po b/crossword_puzzle/locales/ta/LC_MESSAGES/messages.po
index 6d994a744..2834e61d3 100644
--- a/crossword_puzzle/locales/ta/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/ta/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: ta <LL@li.org>\n"
@@ -19,149 +19,140 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "குறுக்கெழுத்து போட்டி"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "குறுக்கெழுத்துக்களைப் பார்க்கவும்"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "பயன்பாட்டிலிருந்து வெளியேறு"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "உலகளாவிய அமைப்புகள்"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "மொழிகள்"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "அளவு"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ஒளி"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "இருள்"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "அமைப்பு"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "தோற்றம்"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "பயங்கரமான"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ஏழை"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "சராசரி"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "நன்று"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "சரியான"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "குறுக்கெழுத்து தரம்"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "குறுக்கெழுத்து உலாவி"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "திரும்பி போ"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "குறுக்கெழுத்து ஏற்றவும்"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "இணைய பயன்பாட்டைத் திறக்கவும்"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "இணைய பயன்பாட்டை நிறுத்தவும்"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "வார்த்தை எண்ணிக்கை விருப்பத்தேர்வுகள்"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "வார்த்தை எண்ணிக்கையைத் தேர்ந்தெடுக்கவும்"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "அதிகபட்சம்"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "தனிப்பயன்"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "இந்த செயல்பாட்டைச் செய்ய, நீங்கள் முதலில் ஒரு கலத்தைத் தேர்ந்தெடுக்க "
 "வேண்டும்."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "காண்க"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "நெருக்கமான"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "சிரமம்"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "மொத்த வார்த்தைகள்"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "சிரமம்"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "தேர்ந்தெடு"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "மறுதொடக்கம்"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "பயன்பாட்டை மறுதொடக்கம் செய்ய விரும்புகிறீர்களா?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "வெளியேறு"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -169,11 +160,11 @@ msgstr ""
 "பயன்பாட்டிலிருந்து நிச்சயமாக வெளியேற விரும்புகிறீர்களா? இணைய பயன்பாடு "
 "இயங்கினால், அது நிறுத்தப்படும்."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "வீட்டுக்குத் திரும்பு"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -181,32 +172,33 @@ msgstr ""
 "முகப்புத் திரைக்கு நிச்சயமாகச் செல்ல விரும்புகிறீர்களா? இணைய பயன்பாடு "
 "நிறுத்தப்படும்."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "பிழை"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "இந்த மொழி ஏற்கனவே தேர்ந்தெடுக்கப்பட்டது."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "இந்த அளவு ஏற்கனவே தேர்ந்தெடுக்கப்பட்டது."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "இந்த தோற்றம் ஏற்கனவே தேர்ந்தெடுக்கப்பட்டது."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "இந்த தரம் ஏற்கனவே தேர்ந்தெடுக்கப்பட்டுள்ளது."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "தகவல்"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -229,7 +221,7 @@ msgstr ""
 "நிறுத்தப்படலாம் அல்லது அவற்றை நிறுத்த உங்கள் கணினியை மறுதொடக்கம் "
 "செய்யுங்கள்."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -241,7 +233,7 @@ msgstr ""
 "அடிப்படை குறுக்கெழுத்து தரவு அதன் மொழிபெயர்க்கப்பட்ட பதிப்பு லோக்கல்ஸ் "
 "கோப்பகத்தில் இல்லாதபோது மட்டுமே அணுகப்படும்."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -249,119 +241,104 @@ msgstr ""
 "குறுக்கெழுத்து உருவாக்கத்தில் பிழை ஏற்பட்டது. கன்சோலில் கூடுதல் தகவலைப் "
 "பார்க்கவும்"
 
-msgid "Easy"
-msgstr "சுலபம்"
-
-msgid "Medium"
-msgstr "நடுத்தர"
-
-msgid "Hard"
-msgstr "கடினமான"
-
-msgid "Extreme"
-msgstr "தீவிர"
-
-msgid "Geography"
-msgstr "நிலவியல்"
-
-msgid "Math"
-msgstr "கணிதம்"
-
-msgid "Science"
-msgstr "அறிவியல்"
-
-msgid "Computer Science"
-msgstr "கணினி அறிவியல்"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "தலைநகரங்கள்"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "குறுக்கெழுத்து புதிர் - விளையாட்டு"
 
-#~ msgid "Countries"
-#~ msgstr "நாடுகள்"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "முழுவதும்"
 
-#~ msgid "Easy"
-#~ msgstr "சுலபம்"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "கீழ்"
 
-#~ msgid "Medium"
-#~ msgstr "நடுத்தர"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "வெளிப்படுத்துங்கள்"
 
-#~ msgid "Hard"
-#~ msgstr "கடினமான"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "செல்"
 
-#~ msgid "Extreme"
-#~ msgstr "தீவிர"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "சொல்"
 
-#~ msgid "Geography"
-#~ msgstr "நிலவியல்"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "கட்டம்"
 
-#~ msgid "Science"
-#~ msgstr "அளவு"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "காசோலை"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "செல்/வார்த்தையைச் சரிபார்க்க அல்லது வெளிப்படுத்த, முதலில் ஒரு கலத்தைத் "
-#~ "தேர்ந்தெடுக்க வேண்டும்"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "தெளிவான"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "குறுக்கெழுத்து புதிர் - விளையாட்டு"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "ஸ்மார்ட் ஸ்கிப்"
 
-#~ msgid "Across"
-#~ msgstr "முழுவதும்"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "பெரிதாக்க கிளிக் செய்க"
 
-#~ msgid "Down"
-#~ msgstr "கீழ்"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "நீங்கள் பார்க்கிறீர்கள்"
 
-#~ msgid "Reveal"
-#~ msgstr "வெளிப்படுத்து"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "இருந்து"
 
-#~ msgid "Cell"
-#~ msgstr "செல்"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "சொல் (களை) செருக முடியவில்லை, மன்னிக்கவும்."
 
-#~ msgid "Word"
-#~ msgstr "சொல்"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "சொல் எண்ணிக்கை (சரிசெய்யப்பட்டது)"
 
-#~ msgid "Grid"
-#~ msgstr "கட்டம்"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "சொல் எண்ணிக்கை"
 
-#~ msgid "Check"
-#~ msgstr "காசோலை"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "தொடரவும்"
 
-#~ msgid "Clear"
-#~ msgstr "தெளிவு"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "நீங்கள் குறுக்கெழுத்து முடித்தீர்கள்!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "ஸ்மார்ட் ஸ்கிப்"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "பெரிதாக்க கிளிக் செய்க"
+msgid "Easy"
+msgstr "சுலபம்"
 
-#~ msgid "You are viewing"
-#~ msgstr "நீங்கள் பார்க்கிறீர்கள்"
+msgid "Medium"
+msgstr "நடுத்தர"
 
-#~ msgid "from"
-#~ msgstr "இருந்து"
+msgid "Hard"
+msgstr "கடினமான"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "வார்த்தை(களை) செருக முடியவில்லை, மன்னிக்கவும்."
+msgid "Extreme"
+msgstr "தீவிர"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "வார்த்தை எண்ணிக்கை (சரிசெய்யப்பட்டது)"
+msgid "Geography"
+msgstr "நிலவியல்"
 
-#~ msgid "Word count"
-#~ msgstr "சொல் எண்ணிக்கை"
+msgid "Math"
+msgstr "கணிதம்"
 
-#~ msgid "Continue"
-#~ msgstr "தொடரவும்"
+msgid "Science"
+msgstr "அறிவியல்"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "நீங்கள் குறுக்கெழுத்து முடித்தீர்கள்!"
+msgid "Computer Science"
+msgstr "கணினி அறிவியல்"
diff --git a/crossword_puzzle/locales/te/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/te/LC_MESSAGES/messages.mo
index e4c62b449..a62546304 100644
Binary files a/crossword_puzzle/locales/te/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/te/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/te/LC_MESSAGES/messages.po b/crossword_puzzle/locales/te/LC_MESSAGES/messages.po
index 2d6e34144..2f4719af6 100644
--- a/crossword_puzzle/locales/te/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/te/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: te <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "పదాల ఆట"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "క్రాస్‌వర్డ్‌లను వీక్షించండి"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "యాప్ నుండి నిష్క్రమించండి"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "గ్లోబల్ సెట్టింగ్‌లు"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "భాషలు"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "కాంతి"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "చీకటి"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "వ్యవస్థ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "స్వరూపం"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "భయంకరమైన"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "పేద"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "సగటు"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "గొప్పది"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "పర్ఫెక్ట్"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "క్రాస్వర్డ్ నాణ్యత"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "క్రాస్వర్డ్ బ్రౌజర్"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "వెనక్కి వెళ్ళు"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "క్రాస్‌వర్డ్‌ని లోడ్ చేయండి"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "వెబ్ యాప్‌ని తెరవండి"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "వెబ్ యాప్‌ను ముగించండి"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "పదాల గణన ప్రాధాన్యతలు"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "పదాల గణనను ఎంచుకోండి"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "గరిష్టం"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "కస్టమ్"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ఈ ఆపరేషన్ చేయడానికి, మీరు మొదట సెల్ ఎంచుకోవాలి."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "చూడండి"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "దగ్గరగా"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "కష్టం"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "మొత్తం పదాలు"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "కష్టం"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "ఎంచుకోండి"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "పునఃప్రారంభించండి"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "మీరు ఖచ్చితంగా యాప్‌ని రీస్టార్ట్ చేయాలనుకుంటున్నారా?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "బయటకి దారి"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "మీరు ఖచ్చితంగా యాప్ నుండి నిష్క్రమించాలనుకుంటున్నారా? వెబ్ యాప్ రన్ "
 "అవుతున్నట్లయితే, అది రద్దు చేయబడుతుంది."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "తిరిగి ఇంటికి"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "మీరు ఖచ్చితంగా హోమ్ స్క్రీన్‌కి తిరిగి వెళ్లాలనుకుంటున్నారా? వెబ్ యాప్ రద్దు"
 " చేయబడుతుంది."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "లోపం"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ఈ భాష ఇప్పటికే ఎంపిక చేయబడింది."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ఈ పరిమాణం ఇప్పటికే ఎంపిక చేయబడింది."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ఈ ప్రదర్శన ఇప్పటికే ఎంపిక చేయబడింది."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "ఈ నాణ్యత ఇప్పటికే ఎంపిక చేయబడింది."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "సమాచారం"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "సరిగ్గా ముగించబడని అన్ని యాప్ ప్రాసెస్‌లు MacOSలో యాక్టివిటీ మానిటర్ ద్వారా "
 "ముగించబడతాయి లేదా వాటిని ముగించడానికి మీ కంప్యూటర్‌ని రీస్టార్ట్ చేయండి."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "లొకేల్స్ డైరెక్టరీలో అనువదించబడిన సంస్కరణ లేనప్పుడు మాత్రమే బేస్ "
 "క్రాస్‌వర్డ్ డేటా యాక్సెస్ చేయబడుతుంది."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "క్రాస్‌వర్డ్ ఉత్పత్తిలో లోపం సంభవించింది. దయచేసి కన్సోల్‌లో మరింత "
 "సమాచారాన్ని చూడండి"
 
-msgid "Easy"
-msgstr "సులువు"
-
-msgid "Medium"
-msgstr "మధ్యస్థం"
-
-msgid "Hard"
-msgstr "హార్డ్"
-
-msgid "Extreme"
-msgstr "విపరీతమైనది"
-
-msgid "Geography"
-msgstr "భౌగోళిక శాస్త్రం"
-
-msgid "Math"
-msgstr "గణితం"
-
-msgid "Science"
-msgstr "సైన్స్"
-
-msgid "Computer Science"
-msgstr "కంప్యూటర్ సైన్స్"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "రాజధానులు"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "క్రాస్వర్డ్ పజిల్ - గేమ్"
 
-#~ msgid "Countries"
-#~ msgstr "దేశాలు"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "అంతటా"
 
-#~ msgid "Easy"
-#~ msgstr "సులువు"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "డౌన్"
 
-#~ msgid "Medium"
-#~ msgstr "మధ్యస్థం"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "బహిర్గతం"
 
-#~ msgid "Hard"
-#~ msgstr "హార్డ్"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "సెల్"
 
-#~ msgid "Extreme"
-#~ msgstr "విపరీతమైనది"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "పదం"
 
-#~ msgid "Geography"
-#~ msgstr "భౌగోళిక శాస్త్రం"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "గ్రిడ్"
 
-#~ msgid "Science"
-#~ msgstr "పరిమాణం"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "తనిఖీ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "సెల్/పదాన్ని తనిఖీ చేయడానికి లేదా బహిర్గతం చేయడానికి, మీరు ముందుగా సెల్‌ను "
-#~ "ఎంచుకోవాలి"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "క్లియర్"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "క్రాస్వర్డ్ పజిల్ - గేమ్"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "స్మార్ట్ స్కిప్"
 
-#~ msgid "Across"
-#~ msgstr "అంతటా"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "జూమ్ చేయడానికి క్లిక్ చేయండి"
 
-#~ msgid "Down"
-#~ msgstr "క్రిందికి"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "మీరు చూస్తున్నారు"
 
-#~ msgid "Reveal"
-#~ msgstr "బహిర్గతం చేయండి"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "నుండి"
 
-#~ msgid "Cell"
-#~ msgstr "సెల్"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "పదం (లు) చేర్చబడలేదు, క్షమించండి."
 
-#~ msgid "Word"
-#~ msgstr "మాట"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "పద గణన (సర్దుబాటు)"
 
-#~ msgid "Grid"
-#~ msgstr "గ్రిడ్"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "పదాల లెక్క"
 
-#~ msgid "Check"
-#~ msgstr "తనిఖీ"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "కొనసాగించండి"
 
-#~ msgid "Clear"
-#~ msgstr "క్లియర్"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "మీరు క్రాస్‌వర్డ్‌ను పూర్తి చేసారు!"
 
-#~ msgid "Smart Skip"
-#~ msgstr "స్మార్ట్ స్కిప్"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "జూమ్ చేయడానికి క్లిక్ చేయండి"
+msgid "Easy"
+msgstr "సులువు"
 
-#~ msgid "You are viewing"
-#~ msgstr "మీరు చూస్తున్నారు"
+msgid "Medium"
+msgstr "మధ్యస్థం"
 
-#~ msgid "from"
-#~ msgstr "నుండి"
+msgid "Hard"
+msgstr "హార్డ్"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "పదం(లు) చొప్పించబడలేదు, క్షమించండి."
+msgid "Extreme"
+msgstr "విపరీతమైనది"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "పదాల సంఖ్య (సర్దుబాటు చేయబడింది)"
+msgid "Geography"
+msgstr "భౌగోళిక శాస్త్రం"
 
-#~ msgid "Word count"
-#~ msgstr "పదాల లెక్క"
+msgid "Math"
+msgstr "గణితం"
 
-#~ msgid "Continue"
-#~ msgstr "కొనసాగించు"
+msgid "Science"
+msgstr "సైన్స్"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "మీరు క్రాస్‌వర్డ్‌ని పూర్తి చేసారు!"
+msgid "Computer Science"
+msgstr "కంప్యూటర్ సైన్స్"
diff --git a/crossword_puzzle/locales/tg/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/tg/LC_MESSAGES/messages.mo
index fd2c69a74..3e278fc7e 100644
Binary files a/crossword_puzzle/locales/tg/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/tg/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/tg/LC_MESSAGES/messages.po b/crossword_puzzle/locales/tg/LC_MESSAGES/messages.po
index a672a4c5d..447e3f71e 100644
--- a/crossword_puzzle/locales/tg/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/tg/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: tg <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Кроссворд"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Кроссвордҳоро тамошо кунед"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Аз барнома хориҷ шавед"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Танзимоти глобалӣ"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Забонҳо"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Андоза"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "нур"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "торик"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "система"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Намуди зоҳирӣ"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "воҳиманок"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "бечора"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "миёна"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "бузург"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "пурра"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Сифати кроссворд"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Браузери кроссворд"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Баргаштан"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Кроссвордро бор кунед"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Барномаи вебро кушоед"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Қатъи барномаи веб"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Афзалиятҳои ҳисобкунии калимаҳо"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Шумораи калимаҳоро интихоб кунед"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максимум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Фармоишгар"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Барои иҷрои ин амалиёт, шумо бояд як чашмакро интихоб кунед."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Намоиш"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Пӯшед"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "душворӣ"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Ҳама калимаҳо"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Мушкилот"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Интихоб кунед"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Оғози дубора"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Шумо мутмаин ҳастед, ки мехоҳед барномаро аз нав оғоз кунед?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Баромадгоҳ"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Шумо мутмаин ҳастед, ки мехоҳед аз барнома хориҷ шавед? Агар барномаи веб "
 "кор кунад, он қатъ карда мешавад."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Бозгашт ба хона"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Шумо мутмаин ҳастед, ки мехоҳед ба экрани асосӣ баргардед? Барномаи веб қатъ"
 " карда мешавад."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Хатогӣ"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ин забон аллакай интихоб шудааст."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Ин андоза аллакай интихоб шудааст."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ин намуди зоҳирӣ аллакай интихоб шудааст."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ин сифат аллакай интихоб шудааст."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Маълумот"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "карда нашудаанд, метавонанд тавассути Monitor Activity дар MacOS қатъ карда "
 "шаванд ё танҳо барои қатъ кардани онҳо компютери худро бозоғоз намоед."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "Маълумоти кроссворди асосӣ танҳо вақте дастрас мешавад, ки версияи "
 "тарҷумашудаи он дар феҳристи забонҳо мавҷуд набошад."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Ҳангоми тавлиди кроссворд хатогӣ рух дод. Лутфан маълумоти бештарро дар "
 "консол бубинед"
 
-msgid "Easy"
-msgstr "Осон"
-
-msgid "Medium"
-msgstr "Миёна"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Муаммои кроссворд - бозӣ"
 
-msgid "Hard"
-msgstr "Сахт"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Дар саросари"
 
-msgid "Extreme"
-msgstr "Аз ҳад зиёд"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Поён"
 
-msgid "Geography"
-msgstr "География"
-
-msgid "Math"
-msgstr "Математика"
-
-msgid "Science"
-msgstr "Илм"
-
-msgid "Computer Science"
-msgstr "Улуми компютерӣ"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Нишон додан"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Ҳуҷайра"
 
-#~ msgid "Capitals"
-#~ msgstr "Пойтахтҳо"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Сухан"
 
-#~ msgid "Countries"
-#~ msgstr "Кишварҳо"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Шабака"
 
-#~ msgid "Easy"
-#~ msgstr "Осон"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Саньидан"
 
-#~ msgid "Medium"
-#~ msgstr "Миёна"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Равшан"
 
-#~ msgid "Hard"
-#~ msgstr "Сахт"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Swip Stip"
 
-#~ msgid "Extreme"
-#~ msgstr "Аз ҳад зиёд"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Барои калон шудан клик кунед"
 
-#~ msgid "Geography"
-#~ msgstr "География"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Шумо мебинед"
 
-#~ msgid "Science"
-#~ msgstr "Андоза"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "аз"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Барои тафтиш ё ошкор кардани ячейка/калима, шумо бояд аввал ячейкаро интихоб"
-#~ " кунед"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Сухан (ҳо) гузоштан мумкин нест, бубахшед."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Кроссворд - Бозӣ"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Ҳисобкунии калима (тасҳеҳшуда)"
 
-#~ msgid "Across"
-#~ msgstr "Дар саросари"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Ҳисоботи калима"
 
-#~ msgid "Down"
-#~ msgstr "Поён"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Давом додан"
 
-#~ msgid "Reveal"
-#~ msgstr "Ошкор кардан"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Шумо кроссвордро анҷом додед!"
 
-#~ msgid "Cell"
-#~ msgstr "Ҳуҷайра"
-
-#~ msgid "Word"
-#~ msgstr "Калом"
-
-#~ msgid "Grid"
-#~ msgstr "Шабака"
-
-#~ msgid "Check"
-#~ msgstr "Санҷед"
-
-#~ msgid "Clear"
-#~ msgstr "Тоза"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Swip Stip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Барои калон шудан клик кунед"
+msgid "Easy"
+msgstr "Осон"
 
-#~ msgid "You are viewing"
-#~ msgstr "Шумо тамошо карда истодаед"
+msgid "Medium"
+msgstr "Миёна"
 
-#~ msgid "from"
-#~ msgstr "аз"
+msgid "Hard"
+msgstr "Сахт"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "калима(ҳо)-ро ворид кардан мумкин нест, бахшиш."
+msgid "Extreme"
+msgstr "Аз ҳад зиёд"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Шумораи калимаҳо (тасҳеҳ)"
+msgid "Geography"
+msgstr "География"
 
-#~ msgid "Word count"
-#~ msgstr "Шумораи калимаҳо"
+msgid "Math"
+msgstr "Математика"
 
-#~ msgid "Continue"
-#~ msgstr "Давом додан"
+msgid "Science"
+msgstr "Илм"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Шумо кроссвордро анҷом додед!"
+msgid "Computer Science"
+msgstr "Улуми компютерӣ"
diff --git a/crossword_puzzle/locales/th/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/th/LC_MESSAGES/messages.mo
index 115004f30..ac0699586 100644
Binary files a/crossword_puzzle/locales/th/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/th/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/th/LC_MESSAGES/messages.po b/crossword_puzzle/locales/th/LC_MESSAGES/messages.po
index 449adea34..03b34ac6b 100644
--- a/crossword_puzzle/locales/th/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/th/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: th <LL@li.org>\n"
@@ -19,189 +19,181 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "ปริศนาอักษรไขว้"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "ดูปริศนาอักษรไขว้"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "ออกจากแอป"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "การตั้งค่าส่วนกลาง"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "ภาษา"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "ขนาด"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "แสงสว่าง"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "มืด"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "ระบบ"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "รูปร่าง"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "ย่ำแย่"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ยากจน"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "เฉลี่ย"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ยอดเยี่ยม"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "สมบูรณ์แบบ"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "คุณภาพของคำไขว้"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "เบราว์เซอร์ Crossword"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "กลับไป"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "โหลดคำไขว้"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "เปิดเว็บแอป"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "ยุติแอปพลิเคชันเว็บ"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "การตั้งค่าการนับจำนวนคำ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "เลือกจำนวนคำ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "ขีดสุด"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "กำหนดเอง"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "ในการดำเนินการนี้คุณต้องเลือกเซลล์ก่อน"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "ดู"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "ปิด"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ความยากลำบาก"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "รวมคำ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "ความยาก"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "เลือก"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "เริ่มต้นใหม่"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการรีสตาร์ทแอป"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "ออก"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr ""
 "คุณแน่ใจหรือไม่ว่าต้องการออกจากแอป หากเว็บแอปทำงานอยู่ แอปนั้นจะถูกยกเลิก"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "กลับไปที่บ้าน"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "คุณแน่ใจหรือไม่ว่าต้องการกลับไปที่หน้าจอหลัก เว็บแอปจะถูกยกเลิก"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "ภาษานี้ถูกเลือกไว้แล้ว"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "ขนาดนี้ถูกเลือกไว้แล้ว"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "ลักษณะที่ปรากฏนี้ถูกเลือกไว้แล้ว"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "คุณภาพนี้ถูกเลือกแล้ว"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "ข้อมูล"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -222,7 +214,7 @@ msgstr ""
 "กระบวนการแอพทั้งหมดที่ยังไม่ถูกยกเลิกอย่างถูกต้องสามารถยุติได้ผ่านตัวตรวจสอบกิจกรรมบน"
 " MacOS หรือเพียงแค่รีสตาร์ทคอมพิวเตอร์เพื่อยุติกระบวนการเหล่านั้น"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -233,123 +225,110 @@ msgstr ""
 "คำจำกัดความมีอยู่ในไดเร็กทอรี cwords ฐาน หมายเหตุ: "
 "ข้อมูลคำไขว้พื้นฐานจะเข้าถึงได้ก็ต่อเมื่อเวอร์ชันที่แปลแล้วไม่ปรากฏในไดเรกทอรีสถานที่"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "เกิดข้อผิดพลาดในการสร้างคำไขว้ โปรดดูข้อมูลเพิ่มเติมในคอนโซล"
 
-msgid "Easy"
-msgstr "ง่าย"
-
-msgid "Medium"
-msgstr "ปานกลาง"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "ปริศนาคำไขว้ - เกม"
 
-msgid "Hard"
-msgstr "แข็ง"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "ข้าม"
 
-msgid "Extreme"
-msgstr "สุดขีด"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "ลง"
 
-msgid "Geography"
-msgstr "ภูมิศาสตร์"
-
-msgid "Math"
-msgstr "คณิตศาสตร์"
-
-msgid "Science"
-msgstr "ศาสตร์"
-
-msgid "Computer Science"
-msgstr "วิทยาศาสตร์คอมพิวเตอร์"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "เปิดเผย"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "ห้องขัง"
 
-#~ msgid "Capitals"
-#~ msgstr "เมืองหลวง"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "คำ"
 
-#~ msgid "Countries"
-#~ msgstr "ประเทศ"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "กริด"
 
-#~ msgid "Easy"
-#~ msgstr "ง่าย"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "ตรวจสอบ"
 
-#~ msgid "Medium"
-#~ msgstr "ปานกลาง"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "ชัดเจน"
 
-#~ msgid "Hard"
-#~ msgstr "แข็ง"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "สุดขีด"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "คลิกเพื่อซูม"
 
-#~ msgid "Geography"
-#~ msgstr "ภูมิศาสตร์"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "คุณกำลังดู"
 
-#~ msgid "Science"
-#~ msgstr "ขนาด"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "จาก"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "หากต้องการตรวจสอบหรือเปิดเผยเซลล์/คำ คุณต้องเลือกเซลล์ก่อน"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "ไม่สามารถแทรกคำได้ขออภัย"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "ปริศนาอักษรไขว้ - เกม"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "จำนวนคำ (ปรับ)"
 
-#~ msgid "Across"
-#~ msgstr "ข้าม"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "การนับจำนวนคำ"
 
-#~ msgid "Down"
-#~ msgstr "ลง"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "ดำเนินการต่อ"
 
-#~ msgid "Reveal"
-#~ msgstr "เปิดเผย"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "คุณทำไขว้เสร็จแล้ว!"
 
-#~ msgid "Cell"
-#~ msgstr "เซลล์"
-
-#~ msgid "Word"
-#~ msgstr "คำ"
-
-#~ msgid "Grid"
-#~ msgstr "กริด"
-
-#~ msgid "Check"
-#~ msgstr "ตรวจสอบ"
-
-#~ msgid "Clear"
-#~ msgstr "ชัดเจน"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "คลิกเพื่อซูม"
+msgid "Easy"
+msgstr "ง่าย"
 
-#~ msgid "You are viewing"
-#~ msgstr "คุณกำลังดู"
+msgid "Medium"
+msgstr "ปานกลาง"
 
-#~ msgid "from"
-#~ msgstr "จาก"
+msgid "Hard"
+msgstr "แข็ง"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ไม่สามารถแทรกคำได้ ขออภัย"
+msgid "Extreme"
+msgstr "สุดขีด"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "จำนวนคำ (ปรับแล้ว)"
+msgid "Geography"
+msgstr "ภูมิศาสตร์"
 
-#~ msgid "Word count"
-#~ msgstr "การนับจำนวนคำ"
+msgid "Math"
+msgstr "คณิตศาสตร์"
 
-#~ msgid "Continue"
-#~ msgstr "ดำเนินการต่อ"
+msgid "Science"
+msgstr "ศาสตร์"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "คุณไขปริศนาอักษรไขว้เสร็จแล้ว!"
+msgid "Computer Science"
+msgstr "วิทยาศาสตร์คอมพิวเตอร์"
diff --git a/crossword_puzzle/locales/tl/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/tl/LC_MESSAGES/messages.mo
index d1e6ec614..7dc4e05df 100644
Binary files a/crossword_puzzle/locales/tl/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/tl/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/tl/LC_MESSAGES/messages.po b/crossword_puzzle/locales/tl/LC_MESSAGES/messages.po
index 5a243fe79..a27d04673 100644
--- a/crossword_puzzle/locales/tl/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/tl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fil_PH <LL@li.org>\n"
@@ -19,149 +19,140 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Palaisipan"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Tingnan ang mga crossword"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Lumabas sa app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Mga Pandaigdigang Setting"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Mga wika"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Sukat"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "liwanag"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "madilim"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistema"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Hitsura"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "kakila -kilabot"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "Mahina"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "average"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "malaki"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "perpekto"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Kalidad ng crossword"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Bumalik ka"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Mag-load ng crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Buksan ang web app"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Wakasan ang web app"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Mga kagustuhan sa bilang ng salita"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Pumili ng bilang ng salita"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Pinakamataas"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Upang maisagawa ang operasyon na ito, kailangan mo munang pumili ng isang "
 "cell."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Tingnan"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Isara"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "kahirapan"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Kabuuang mga salita"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Kahirapan"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Pumili"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "I-restart"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Sigurado ka bang gusto mong i-restart ang app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Lumabas"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -169,11 +160,11 @@ msgstr ""
 "Sigurado ka bang gusto mong lumabas sa app? Kung tumatakbo ang web app, "
 "wawakasan ito."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Bumalik sa bahay"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -181,32 +172,33 @@ msgstr ""
 "Sigurado ka bang gusto mong bumalik sa home screen? Ang web app ay "
 "wawakasan."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Error"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Napili na ang wikang ito."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Napili na ang laki na ito."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Ang hitsura na ito ay napili na."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Napili na ang kalidad na ito."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Impormasyon"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 " natapos ay maaaring wakasan sa pamamagitan ng Activity Monitor sa MacOS, o,"
 " i-restart lang ang iyong computer upang wakasan ang mga ito."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "directory. TANDAAN: Ang base crossword data ay ina-access lamang kapag ang "
 "isinaling bersyon nito ay wala sa direktoryo ng mga lokal."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Nagkaroon ng error sa pagbuo ng crossword. Mangyaring tingnan ang "
 "karagdagang impormasyon sa console"
 
-msgid "Easy"
-msgstr "Madali"
-
-msgid "Medium"
-msgstr "Katamtaman"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Crossword Puzzle - Game"
 
-msgid "Hard"
-msgstr "Mahirap"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Sa kabuuan"
 
-msgid "Extreme"
-msgstr "Extreme"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Pababa"
 
-msgid "Geography"
-msgstr "Heograpiya"
-
-msgid "Math"
-msgstr "Math"
-
-msgid "Science"
-msgstr "Agham"
-
-msgid "Computer Science"
-msgstr "Computer science"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ibunyag"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Cell"
 
-#~ msgid "Capitals"
-#~ msgstr "Mga kapital"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Salita"
 
-#~ msgid "Countries"
-#~ msgstr "Mga bansa"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Grid"
 
-#~ msgid "Easy"
-#~ msgstr "Madali"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Suriin"
 
-#~ msgid "Medium"
-#~ msgstr "Katamtaman"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Malinaw"
 
-#~ msgid "Hard"
-#~ msgstr "Mahirap"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Grabe"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Mag -click upang mag -zoom"
 
-#~ msgid "Geography"
-#~ msgstr "Heograpiya"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Tinitingnan mo"
 
-#~ msgid "Science"
-#~ msgstr "Sukat"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "mula sa"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Upang suriin o ipakita ang isang cell/salita, kailangan mo munang pumili ng "
-#~ "isang cell"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ang mga (mga) salita ay hindi maipasok, paumanhin."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword Puzzle - Laro"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Bilang ng salita (nababagay)"
 
-#~ msgid "Across"
-#~ msgstr "Sa kabila"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Bilang ng salita"
 
-#~ msgid "Down"
-#~ msgstr "Pababa"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Magpatuloy"
 
-#~ msgid "Reveal"
-#~ msgstr "Ibunyag"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Natapos mo ang crossword!"
 
-#~ msgid "Cell"
-#~ msgstr "Cell"
-
-#~ msgid "Word"
-#~ msgstr "salita"
-
-#~ msgid "Grid"
-#~ msgstr "Grid"
-
-#~ msgid "Check"
-#~ msgstr "Suriin"
-
-#~ msgid "Clear"
-#~ msgstr "Maaliwalas"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Mag -click upang mag -zoom"
+msgid "Easy"
+msgstr "Madali"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ikaw ay tumitingin"
+msgid "Medium"
+msgstr "Katamtaman"
 
-#~ msgid "from"
-#~ msgstr "mula sa"
+msgid "Hard"
+msgstr "Mahirap"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "hindi maipasok ang (mga) salita, paumanhin."
+msgid "Extreme"
+msgstr "Extreme"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Bilang ng salita (naayos)"
+msgid "Geography"
+msgstr "Heograpiya"
 
-#~ msgid "Word count"
-#~ msgstr "Bilang ng salita"
+msgid "Math"
+msgstr "Math"
 
-#~ msgid "Continue"
-#~ msgstr "Magpatuloy"
+msgid "Science"
+msgstr "Agham"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Nakumpleto mo ang crossword!"
+msgid "Computer Science"
+msgstr "Computer science"
diff --git a/crossword_puzzle/locales/tr/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/tr/LC_MESSAGES/messages.mo
index a216618b3..a166cfd15 100644
Binary files a/crossword_puzzle/locales/tr/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/tr/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/tr/LC_MESSAGES/messages.po b/crossword_puzzle/locales/tr/LC_MESSAGES/messages.po
index 0320986cf..c9a9d1a62 100644
--- a/crossword_puzzle/locales/tr/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/tr/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: tr <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Çapraz bulmaca"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Bulmacaları görüntüle"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Uygulamadan çık"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Genel Ayarlar"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Diller"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Boyut"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ışık"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "karanlık"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "sistem"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Dış görünüş"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "korkunç"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "fakir"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "ortalama"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Harika"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "mükemmel"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Bulmaca kalitesi"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Bulmaca Tarayıcı"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Geri gitmek"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Bulmaca yükle"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Web uygulamasını aç"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Web uygulamasını sonlandır"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Kelime sayısı tercihleri"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Kelime sayısını seçin"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimum"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Gelenek"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Bu işlemi gerçekleştirmek için önce bir hücre seçmelisiniz."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Görüş"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Kapalı"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "zorluk"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Toplam kelime"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Zorluk"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Seçme"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Tekrar başlat"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Uygulamayı yeniden başlatmak istediğinizden emin misiniz?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "çıkış"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Uygulamadan çıkmak istediğinizden emin misiniz? Web uygulaması çalışıyorsa "
 "sonlandırılacaktır."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Eve geri dön"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ana ekrana dönmek istediğinizden emin misiniz? Web uygulaması "
 "sonlandırılacak."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Hata"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Bu dil zaten seçili."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Bu boyut zaten seçili."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Bu görünüm zaten seçili."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Bu kalite zaten seçildi."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Bilgi"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -228,7 +220,7 @@ msgstr ""
 "sonlandırılabilir veya bunları sonlandırmak için bilgisayarınızı yeniden "
 "başlatmanız yeterlidir."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -240,7 +232,7 @@ msgstr ""
 "verilerine yalnızca çevrilmiş sürümü yerel ayarlar dizininde mevcut "
 "olmadığında erişilir."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -248,119 +240,104 @@ msgstr ""
 "Bulmaca oluşturmada bir hata oluştu. Lütfen konsoldaki daha fazla bilgiye "
 "bakın"
 
-msgid "Easy"
-msgstr "Kolay"
-
-msgid "Medium"
-msgstr "Orta"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Bulmaca - Oyun"
 
-msgid "Hard"
-msgstr "Zor"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Karşısında"
 
-msgid "Extreme"
-msgstr "Aşırı"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Aşağı"
 
-msgid "Geography"
-msgstr "Coğrafya"
-
-msgid "Math"
-msgstr "Matematik"
-
-msgid "Science"
-msgstr "Bilim"
-
-msgid "Computer Science"
-msgstr "Bilgisayar Bilimi"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Ortaya çıkarmak"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Hücre"
 
-#~ msgid "Capitals"
-#~ msgstr "Başkentler"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Kelime"
 
-#~ msgid "Countries"
-#~ msgstr "Ülkeler"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Kafes"
 
-#~ msgid "Easy"
-#~ msgstr "Kolay"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kontrol etmek"
 
-#~ msgid "Medium"
-#~ msgstr "Orta"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Temizlemek"
 
-#~ msgid "Hard"
-#~ msgstr "Zor"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Akıllı atlama"
 
-#~ msgid "Extreme"
-#~ msgstr "Aşırı"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Yakınlaştırmak için tıklayın"
 
-#~ msgid "Geography"
-#~ msgstr "Coğrafya"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "İzliyorsun"
 
-#~ msgid "Science"
-#~ msgstr "Boyut"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "itibaren"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Bir hücreyi/kelimeyi kontrol etmek veya ortaya çıkarmak için önce bir hücre "
-#~ "seçmelisiniz"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Kelime (ler) eklenemedi, üzgünüm."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Bulmaca - Oyun"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Kelime sayısı (ayarlanmış)"
 
-#~ msgid "Across"
-#~ msgstr "Karşısında"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Sözcük sayısı"
 
-#~ msgid "Down"
-#~ msgstr "Aşağı"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Devam etmek"
 
-#~ msgid "Reveal"
-#~ msgstr "Ortaya çıkarmak"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Bulmacayı tamamladınız!"
 
-#~ msgid "Cell"
-#~ msgstr "Hücre"
-
-#~ msgid "Word"
-#~ msgstr "Kelime"
-
-#~ msgid "Grid"
-#~ msgstr "Kafes"
-
-#~ msgid "Check"
-#~ msgstr "Kontrol etmek"
-
-#~ msgid "Clear"
-#~ msgstr "Temizlemek"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Akıllı atlama"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Yakınlaştırmak için tıklayın"
+msgid "Easy"
+msgstr "Kolay"
 
-#~ msgid "You are viewing"
-#~ msgstr "İzliyorsun"
+msgid "Medium"
+msgstr "Orta"
 
-#~ msgid "from"
-#~ msgstr "itibaren"
+msgid "Hard"
+msgstr "Zor"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "kelime(ler) eklenemedi, kusura bakmayın."
+msgid "Extreme"
+msgstr "Aşırı"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Kelime sayısı (düzeltildi)"
+msgid "Geography"
+msgstr "Coğrafya"
 
-#~ msgid "Word count"
-#~ msgstr "Sözcük sayısı"
+msgid "Math"
+msgstr "Matematik"
 
-#~ msgid "Continue"
-#~ msgstr "Devam etmek"
+msgid "Science"
+msgstr "Bilim"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Bulmacayı tamamladınız!"
+msgid "Computer Science"
+msgstr "Bilgisayar Bilimi"
diff --git a/crossword_puzzle/locales/uk/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/uk/LC_MESSAGES/messages.mo
index 95c5e2695..958c39282 100644
Binary files a/crossword_puzzle/locales/uk/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/uk/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/uk/LC_MESSAGES/messages.po b/crossword_puzzle/locales/uk/LC_MESSAGES/messages.po
index 797f7cccc..f6346f205 100644
--- a/crossword_puzzle/locales/uk/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/uk/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: uk <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Кросворд"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Переглянути кросворди"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Вийдіть із програми"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Глобальні налаштування"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Мови"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Розмір"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "світло"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "темний"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "система"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Зовнішній вигляд"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "жахливий"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "бідний"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "середній"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "великий"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "ідеальний"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Якість кросворду"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Браузер кросвордів"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Повертайся"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Завантажити кросворд"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Відкрийте веб-програму"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Завершити роботу веб-програми"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Параметри підрахунку слів"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Виберіть кількість слів"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Максимум"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Custom"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Щоб виконати цю операцію, необхідно спочатку виділити клітинку."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Переглянути"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Закрити"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "труднощі"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Всього слів"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Складність"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Виберіть"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Перезапустіть"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ви впевнені, що бажаєте перезапустити програму?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Вихід"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ви впевнені, що бажаєте вийти з програми? Якщо веб-програма запущена, її "
 "роботу буде припинено."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Назад додому"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Ви впевнені, що хочете повернутися на головний екран? Роботу веб-програми "
 "буде припинено."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Помилка"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Цю мову вже вибрано."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Цей розмір уже вибрано."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Цей вигляд уже вибрано."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ця якість вже обрана."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Інформація"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "завершені належним чином, можна припинити через Монітор активності в MacOS "
 "або просто перезавантажте комп’ютер, щоб завершити їх."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 " ПРИМІТКА. Базові дані кросворду доступні лише тоді, коли їх перекладена "
 "версія відсутня в каталозі локалей."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Під час створення кросворду сталася помилка. Додаткову інформацію дивіться "
 "на консолі"
 
-msgid "Easy"
-msgstr "легко"
-
-msgid "Medium"
-msgstr "Середній"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Кросворд - гра"
 
-msgid "Hard"
-msgstr "важко"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Поперек"
 
-msgid "Extreme"
-msgstr "Екстрім"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Вниз"
 
-msgid "Geography"
-msgstr "Географія"
-
-msgid "Math"
-msgstr "математика"
-
-msgid "Science"
-msgstr "Наука"
-
-msgid "Computer Science"
-msgstr "Комп'ютерна наука"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Виявляти"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Клітина"
 
-#~ msgid "Capitals"
-#~ msgstr "Столиці"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Слово"
 
-#~ msgid "Countries"
-#~ msgstr "Країни"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Сітка"
 
-#~ msgid "Easy"
-#~ msgstr "легко"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Перевіряти"
 
-#~ msgid "Medium"
-#~ msgstr "Середній"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Чіткий"
 
-#~ msgid "Hard"
-#~ msgstr "важко"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Розумний пропуск"
 
-#~ msgid "Extreme"
-#~ msgstr "Екстрім"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Клацніть, щоб збільшити масштаб"
 
-#~ msgid "Geography"
-#~ msgstr "Географія"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Ви переглядаєте"
 
-#~ msgid "Science"
-#~ msgstr "Розмір"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "з"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Щоб перевірити або відкрити комірку/слово, ви повинні спочатку вибрати "
-#~ "комірку"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Слово (и) не можна було вставити, вибачте."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Кросворд - гра"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Кількість слів (скоригована)"
 
-#~ msgid "Across"
-#~ msgstr "Поперек"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Підрахунок слів"
 
-#~ msgid "Down"
-#~ msgstr "вниз"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Продовжувати"
 
-#~ msgid "Reveal"
-#~ msgstr "Розкрити"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ви завершили кросворд!"
 
-#~ msgid "Cell"
-#~ msgstr "Стільниковий"
-
-#~ msgid "Word"
-#~ msgstr "Слово"
-
-#~ msgid "Grid"
-#~ msgstr "Сітка"
-
-#~ msgid "Check"
-#~ msgstr "Перевірте"
-
-#~ msgid "Clear"
-#~ msgstr "ясно"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Розумний пропуск"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Клацніть, щоб збільшити масштаб"
+msgid "Easy"
+msgstr "легко"
 
-#~ msgid "You are viewing"
-#~ msgstr "Ви переглядаєте"
+msgid "Medium"
+msgstr "Середній"
 
-#~ msgid "from"
-#~ msgstr "від"
+msgid "Hard"
+msgstr "важко"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "Не вдалося вставити слово(а), вибачте."
+msgid "Extreme"
+msgstr "Екстрім"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Кількість слів (скоригована)"
+msgid "Geography"
+msgstr "Географія"
 
-#~ msgid "Word count"
-#~ msgstr "Підрахунок слів"
+msgid "Math"
+msgstr "математика"
 
-#~ msgid "Continue"
-#~ msgstr "Продовжити"
+msgid "Science"
+msgstr "Наука"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Ви закінчили кросворд!"
+msgid "Computer Science"
+msgstr "Комп'ютерна наука"
diff --git a/crossword_puzzle/locales/uz/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/uz/LC_MESSAGES/messages.mo
index 569cf340f..c2b69dcf7 100644
Binary files a/crossword_puzzle/locales/uz/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/uz/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/uz/LC_MESSAGES/messages.po b/crossword_puzzle/locales/uz/LC_MESSAGES/messages.po
index 3b67d1d61..92482d8ac 100644
--- a/crossword_puzzle/locales/uz/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/uz/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: uz <LL@li.org>\n"
@@ -19,148 +19,139 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Krossvord"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Krossvordlarni ko'rish"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Ilovadan chiqing"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Global sozlamalar"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Tillar"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Hajmi"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "yorug'lik"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "qorong'i"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "tizimi"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Tashqi ko'rinish"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "qo'rqinchli"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "kambag'al"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "o'rtacha"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "ajoyib"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "mukammal"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Krossvord sifati"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Krossvord brauzer"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Ortga qaytish"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Krossvordni yuklab oling"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Veb-ilovani oching"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Veb-ilovani tugatish"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "So'zlarni hisoblash sozlamalari"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "So'z sonini tanlang"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Maksimal"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Maxsus"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr ""
 "Ushbu operatsiyani bajarish uchun avval katakchani tanlashingiz kerak."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Ko'rinish"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Yopish"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "qiyinchilik"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Jami so'zlar"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Qiyinchilik"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Tanlang"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Qayta ishga tushirish"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Haqiqatan ham ilovani qayta ishga tushirmoqchimisiz?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Chiqish"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -168,42 +159,43 @@ msgstr ""
 "Haqiqatan ham ilovadan chiqmoqchimisiz? Agar veb-ilova ishlayotgan bo'lsa, u"
 " tugatiladi."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Uyga qaytish"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "Haqiqatan ham bosh ekranga qaytmoqchimisiz? Veb-ilova tugatiladi."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Xato"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Bu til allaqachon tanlangan."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Bu oʻlcham allaqachon tanlangan."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Bu ko'rinish allaqachon tanlangan."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Ushbu sifat allaqachon tanlangan."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Ma'lumot"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "Activity Monitor orqali tugatilishi mumkin yoki ularni tugatish uchun "
 "kompyuteringizni qayta ishga tushirishingiz mumkin."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 "Asosiy krossvord ma'lumotlariga faqat uning tarjima qilingan versiyasi "
 "mahalliy tillar katalogida mavjud bo'lmaganda kirish mumkin."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,119 +238,104 @@ msgstr ""
 "Krossvord yaratishda xatolik yuz berdi. Iltimos, qo'shimcha ma'lumotni "
 "konsolda ko'ring"
 
-msgid "Easy"
-msgstr "Oson"
-
-msgid "Medium"
-msgstr "O'rta"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Krossvord jumboq - o'yin"
 
-msgid "Hard"
-msgstr "Qattiq"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Bo'ylab"
 
-msgid "Extreme"
-msgstr "Ekstremal"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Pastga"
 
-msgid "Geography"
-msgstr "Geografiya"
-
-msgid "Math"
-msgstr "Matematika"
-
-msgid "Science"
-msgstr "Fan"
-
-msgid "Computer Science"
-msgstr "Kompyuter fanlari"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Oshkor qilmoq"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Uyali"
 
-#~ msgid "Capitals"
-#~ msgstr "Poytaxtlar"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "So'z"
 
-#~ msgid "Countries"
-#~ msgstr "Mamlakatlar"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Panjara"
 
-#~ msgid "Easy"
-#~ msgstr "Oson"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Tekshirmoq"
 
-#~ msgid "Medium"
-#~ msgstr "O'rta"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Aniq"
 
-#~ msgid "Hard"
-#~ msgstr "Qattiq"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart O'tkazib yuborish"
 
-#~ msgid "Extreme"
-#~ msgstr "Ekstremal"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Kattalashtirish uchun bosing"
 
-#~ msgid "Geography"
-#~ msgstr "Geografiya"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Siz ko'ryapsiz"
 
-#~ msgid "Science"
-#~ msgstr "Hajmi"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "dan"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Hujayra/so'zni tekshirish yoki ochish uchun avval katakchani tanlashingiz "
-#~ "kerak"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Kechirasiz, Word (lar). Kechirasiz."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Krossvord - o'yin"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Word soni (sozlangan)"
 
-#~ msgid "Across"
-#~ msgstr "Bo'ylab"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "So'zlar soni"
 
-#~ msgid "Down"
-#~ msgstr "Pastga"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Davom eting"
 
-#~ msgid "Reveal"
-#~ msgstr "Oshkor qilish"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Siz krossvordni tugatdingiz!"
 
-#~ msgid "Cell"
-#~ msgstr "Hujayra"
-
-#~ msgid "Word"
-#~ msgstr "So'z"
-
-#~ msgid "Grid"
-#~ msgstr "To‘r"
-
-#~ msgid "Check"
-#~ msgstr "Tekshirish"
-
-#~ msgid "Clear"
-#~ msgstr "Toza"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart O'tkazib yuborish"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Kattalashtirish uchun bosing"
+msgid "Easy"
+msgstr "Oson"
 
-#~ msgid "You are viewing"
-#~ msgstr "Siz tomosha qilyapsiz"
+msgid "Medium"
+msgstr "O'rta"
 
-#~ msgid "from"
-#~ msgstr "dan"
+msgid "Hard"
+msgstr "Qattiq"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "so'z(lar)ni kiritib bo'lmadi, uzr."
+msgid "Extreme"
+msgstr "Ekstremal"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "So'zlar soni (sozlangan)"
+msgid "Geography"
+msgstr "Geografiya"
 
-#~ msgid "Word count"
-#~ msgstr "So'zlar soni"
+msgid "Math"
+msgstr "Matematika"
 
-#~ msgid "Continue"
-#~ msgstr "Davom eting"
+msgid "Science"
+msgstr "Fan"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Siz krossvordni tugatdingiz!"
+msgid "Computer Science"
+msgstr "Kompyuter fanlari"
diff --git a/crossword_puzzle/locales/vi/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/vi/LC_MESSAGES/messages.mo
index ca20cbd62..b40b821f8 100644
Binary files a/crossword_puzzle/locales/vi/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/vi/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/vi/LC_MESSAGES/messages.po b/crossword_puzzle/locales/vi/LC_MESSAGES/messages.po
index 96a5d1296..87772d33b 100644
--- a/crossword_puzzle/locales/vi/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/vi/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: vi <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Câu đố ô chữ"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Xem ô chữ"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Thoát khỏi ứng dụng"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Thiết lập toàn cầu"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Ngôn ngữ"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ánh sáng"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "tối tăm"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "hệ thống"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Vẻ bề ngoài"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "kinh khủng"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "nghèo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "trung bình"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "Tuyệt"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "hoàn hảo "
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Chất lượng ô chữ"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Trình duyệt ô chữ"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Quay lại"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Tải ô chữ"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Mở ứng dụng web"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Chấm dứt ứng dụng web"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Tùy chọn đếm từ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Chọn số từ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Tối đa"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Phong tục"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Để thực hiện thao tác này, trước tiên bạn phải chọn một ô."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Xem"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Đóng"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "khó khăn"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Tổng số từ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Khó khăn"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Lựa chọn"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Khởi động lại"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Bạn có chắc chắn muốn khởi động lại ứng dụng không?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Lối ra"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Bạn có chắc chắn muốn thoát khỏi ứng dụng không? Nếu ứng dụng web đang chạy,"
 " nó sẽ bị chấm dứt."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Trở về nhà"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Bạn có chắc chắn muốn quay lại màn hình chính không? Ứng dụng web sẽ bị chấm"
 " dứt."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Lỗi"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ngôn ngữ này đã được chọn."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Kích thước này đã được chọn."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Giao diện này đã được chọn."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Chất lượng này đã được chọn."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Thông tin"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -226,7 +218,7 @@ msgstr ""
 "thể bị chấm dứt thông qua Trình giám sát hoạt động trên MacOS hoặc chỉ cần "
 "khởi động lại máy tính của bạn để chấm dứt chúng."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -238,7 +230,7 @@ msgstr ""
 " chỉ được truy cập khi phiên bản dịch của nó không có trong thư mục ngôn "
 "ngữ."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -246,117 +238,104 @@ msgstr ""
 "Đã xảy ra lỗi khi tạo ô chữ. Vui lòng xem thêm thông tin trong bảng điều "
 "khiển"
 
-msgid "Easy"
-msgstr "Dễ"
-
-msgid "Medium"
-msgstr "Trung bình"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Trò chơi ô chữ - Trò chơi"
 
-msgid "Hard"
-msgstr "Cứng"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Sang"
 
-msgid "Extreme"
-msgstr "Vô cùng"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Xuống"
 
-msgid "Geography"
-msgstr "Địa lý"
-
-msgid "Math"
-msgstr "Toán học"
-
-msgid "Science"
-msgstr "Khoa học"
-
-msgid "Computer Science"
-msgstr "Khoa học máy tính"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Tiết lộ"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Tế bào"
 
-#~ msgid "Capitals"
-#~ msgstr "Thủ đô"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Từ"
 
-#~ msgid "Countries"
-#~ msgstr "Quốc gia"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Lưới"
 
-#~ msgid "Easy"
-#~ msgstr "Dễ"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Kiểm tra"
 
-#~ msgid "Medium"
-#~ msgstr "Trung bình"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Thông thoáng"
 
-#~ msgid "Hard"
-#~ msgstr "Cứng"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Bỏ qua thông minh"
 
-#~ msgid "Extreme"
-#~ msgstr "Vô cùng"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Bấm để phóng to"
 
-#~ msgid "Geography"
-#~ msgstr "Địa lý"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Bạn đang xem"
 
-#~ msgid "Science"
-#~ msgstr "Kích cỡ"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "từ"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Để kiểm tra hoặc hiển thị một ô/từ, trước tiên bạn phải chọn một ô"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "(các) từ không thể được chèn, xin lỗi."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Câu Đố Ô Chữ - Trò Chơi"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Đếm từ (đã điều chỉnh)"
 
-#~ msgid "Across"
-#~ msgstr "Sang"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Số từ"
 
-#~ msgid "Down"
-#~ msgstr "Xuống"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Tiếp tục"
 
-#~ msgid "Reveal"
-#~ msgstr "Tiết lộ"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Bạn đã hoàn thành ô chữ!"
 
-#~ msgid "Cell"
-#~ msgstr "Tế bào"
-
-#~ msgid "Word"
-#~ msgstr "Từ"
-
-#~ msgid "Grid"
-#~ msgstr "Lưới"
-
-#~ msgid "Check"
-#~ msgstr "Kiểm tra"
-
-#~ msgid "Clear"
-#~ msgstr "Thông thoáng"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Bỏ qua thông minh"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Bấm để phóng to"
+msgid "Easy"
+msgstr "Dễ"
 
-#~ msgid "You are viewing"
-#~ msgstr "Bạn đang xem"
+msgid "Medium"
+msgstr "Trung bình"
 
-#~ msgid "from"
-#~ msgstr "từ"
+msgid "Hard"
+msgstr "Cứng"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "(các) từ không thể chèn được, xin lỗi."
+msgid "Extreme"
+msgstr "Vô cùng"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Số từ (đã điều chỉnh)"
+msgid "Geography"
+msgstr "Địa lý"
 
-#~ msgid "Word count"
-#~ msgstr "Số từ"
+msgid "Math"
+msgstr "Toán học"
 
-#~ msgid "Continue"
-#~ msgstr "Tiếp tục"
+msgid "Science"
+msgstr "Khoa học"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Bạn đã hoàn thành ô chữ!"
+msgid "Computer Science"
+msgstr "Khoa học máy tính"
diff --git a/crossword_puzzle/locales/xh/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/xh/LC_MESSAGES/messages.mo
index 4c530b50d..027cf3460 100644
Binary files a/crossword_puzzle/locales/xh/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/xh/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/xh/LC_MESSAGES/messages.po b/crossword_puzzle/locales/xh/LC_MESSAGES/messages.po
index 17a3227bf..67101b611 100644
--- a/crossword_puzzle/locales/xh/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/xh/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: xh <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Iphazile yamagama ikroswayo"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Jonga amagama anqamlezayo"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Phuma kwi-app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Iisetingi zehlabathi"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Iilwimi"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Ubungakanani"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ukukhanya"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mnyama"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "inkqubo"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Imbonakalo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "yoyikeka"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "ihlwempu"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "umndilili"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "kakhulu"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "igqibelele"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Umgangatho ongumqobo"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Isikhangeli samagama"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Buya umva"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Layisha amagama anqamlezayo"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Vula i-app yewebhu"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Cima i-app yewebhu"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Ubalo lwamagama olukhethwayo"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Khetha ubalo lwamagama"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Ubuninzi"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Isiko"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Ukwenza lo msebenzi, kufuneka uqale ukukhetha iseli."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Jonga"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Vala"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ubunzima"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Amagama ewonke"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Ubunzima"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Khetha"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Phinda Uqalele"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Uqinisekile ufuna ukuyiqala ngokutsha i-app?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Phuma"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Uqinisekile ufuna ukuphuma kwi-app? Ukuba i-app yewebhu iyasebenza, iya "
 "kupheliswa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Buyela ekhaya"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Uqinisekile ukuba ufuna ukubuyela kwiscreen sasekhaya? Usetyenziso lwewebhu "
 "luya kupheliswa."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Impazamo"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Olu lwimi sele lukhethiwe."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Lo bungakanani sele bukhethiwe."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Le mbonakalo sele ikhethiwe."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Olu phawu sele lukhethiwe."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Ulwazi"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "ngoMsebenzi weMonitor kwiMacOS, okanye, vele uqalise ikhompyuter yakho ukuze"
 " uziphelise."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "esiseko. QAPHELA: Isiseko sedatha yamagama anqamlezileyo ifumaneka kuphela "
 "xa uguqulelo lwayo oluguquliweyo lungekho kulawulo lweendawo."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,6 +239,84 @@ msgstr ""
 "Kwenzeke impazamo ekuvelisweni kwamagama. Nceda ubone ulwazi olongezelelweyo"
 " kwi-console"
 
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "I-puzzle will-umdlalo"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Ngaphaya"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Phantsi"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Tyhila"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Iseli"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Igama"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Igridi"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Jonga"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Cacisa"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart skip"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Cofa ukuze usondeze"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Ujonga"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ukusuka"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Igama (s) alikwazanga ukufakwa, uxolo."
+
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Ukubalwa kwamagama (uhlengahlengiso)"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Ibalwa lamagama"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Qhubeka"
+
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Ugqibezele igama lomnqamlezo!"
+
 msgid "Easy"
 msgstr "Kulula"
 
@@ -270,95 +340,3 @@ msgstr "Inzululwazi"
 
 msgid "Computer Science"
 msgstr "Ubunzululwazi bekhompyutha"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "Iinkunzi"
-
-#~ msgid "Countries"
-#~ msgstr "Amazwe"
-
-#~ msgid "Easy"
-#~ msgstr "Kulula"
-
-#~ msgid "Medium"
-#~ msgstr "Phakathi"
-
-#~ msgid "Hard"
-#~ msgstr "Kunzima"
-
-#~ msgid "Extreme"
-#~ msgstr "Ngokugqithisileyo"
-
-#~ msgid "Geography"
-#~ msgstr "IJografi"
-
-#~ msgid "Science"
-#~ msgstr "Ubungakanani"
-
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr ""
-#~ "Ukukhangela okanye ukutyhila iseli/igama, kufuneka ukhethe kuqala iseli"
-
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "I-Crossword Puzzle - Umdlalo"
-
-#~ msgid "Across"
-#~ msgstr "Ngaphesheya"
-
-#~ msgid "Down"
-#~ msgstr "Phantsi"
-
-#~ msgid "Reveal"
-#~ msgstr "Tyhila"
-
-#~ msgid "Cell"
-#~ msgstr "Iseli"
-
-#~ msgid "Word"
-#~ msgstr "Ilizwi"
-
-#~ msgid "Grid"
-#~ msgstr "Igridi"
-
-#~ msgid "Check"
-#~ msgstr "Khangela"
-
-#~ msgid "Clear"
-#~ msgstr "Cacileyo"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Cofa ukuze usondeze"
-
-#~ msgid "You are viewing"
-#~ msgstr "Uyabukela"
-
-#~ msgid "from"
-#~ msgstr "ukusuka"
-
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "(amagama) akakwazanga kufakwa, uxolo."
-
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Ubalo lwamagama (lulungisiwe)"
-
-#~ msgid "Word count"
-#~ msgstr "Ubalo lwamagama"
-
-#~ msgid "Continue"
-#~ msgstr "Qhubeka"
-
-#~ msgid "You completed the crossword!"
-#~ msgstr "Uligqibile igama elinqamlezileyo!"
diff --git a/crossword_puzzle/locales/yo/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/yo/LC_MESSAGES/messages.mo
index 21722f126..c13b46783 100644
Binary files a/crossword_puzzle/locales/yo/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/yo/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/yo/LC_MESSAGES/messages.po b/crossword_puzzle/locales/yo/LC_MESSAGES/messages.po
index 1b56c363a..18904c10f 100644
--- a/crossword_puzzle/locales/yo/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/yo/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: yo <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "Crossword adojuru"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Wo crosswords"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Jade ni app"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Eto Agbaye"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Awọn ede"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Iwọn"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "imole"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "dudu"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "eto"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ifarahan"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "bibanilẹru"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "talaka"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "aropin"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "nla"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "pipe"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Didara"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Crossword Browser"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Pada"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Fifuye crossword"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Ṣii ohun elo wẹẹbu"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Pa ohun elo wẹẹbu kuro"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Awọn ayanfẹ kika ọrọ"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Yan kika ọrọ"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "O pọju"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Aṣa"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Lati ṣe iṣẹ yii, o gbọdọ kọkọ yan sẹẹli kan."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Wo"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Sunmọ"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "iṣoro"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Lapapọ awọn ọrọ"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Iṣoro"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Yan"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Tun bẹrẹ"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Ṣe o da ọ loju pe o fẹ tun app naa bẹrẹ?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Jade"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,43 +158,44 @@ msgstr ""
 "Ṣe o da ọ loju pe o fẹ jade kuro ni app naa? Ti ohun elo wẹẹbu n ṣiṣẹ, yoo "
 "fopin si."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Pada si ile"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr ""
 "Ṣe o da ọ loju pe o fẹ pada si iboju ile? Ohun elo wẹẹbu yoo fopin si."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Asise"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Ede yii ti yan tẹlẹ."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Iwọn yii ti yan tẹlẹ."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Irisi yii ti yan tẹlẹ."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Didara yii ti yan tẹlẹ."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Alaye"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -224,7 +216,7 @@ msgstr ""
 "ilana app ti ko ti fopin daradara le jẹ fopin si nipasẹ Atẹle Iṣẹ ṣiṣe lori "
 "MacOS, tabi tun bẹrẹ kọnputa rẹ lati fopin si wọn."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -235,123 +227,110 @@ msgstr ""
 "asọye rẹ faili JSON wa ninu iwe ilana cwords mimọ. AKIYESI: Data crossword "
 "mimọ jẹ wọle nikan nigbati ẹya ti a tumọ ko si ninu ilana awọn agbegbe."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "Asise waye ni crossword iran. Jọwọ wo alaye siwaju sii ninu console"
 
-msgid "Easy"
-msgstr "Rọrun"
-
-msgid "Medium"
-msgstr "Alabọde"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Adojuru ipinlẹ - ere"
 
-msgid "Hard"
-msgstr "Lile"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Kọja"
 
-msgid "Extreme"
-msgstr "Pupọ"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Si isalẹ"
 
-msgid "Geography"
-msgstr "Geography"
-
-msgid "Math"
-msgstr "Isiro"
-
-msgid "Science"
-msgstr "Imọ"
-
-msgid "Computer Science"
-msgstr "Imo komputa sayensi"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Fihan"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Padi"
 
-#~ msgid "Capitals"
-#~ msgstr "Awọn olu-ilu"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Ọrọ"
 
-#~ msgid "Countries"
-#~ msgstr "Awọn orilẹ-ede"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Akoj"
 
-#~ msgid "Easy"
-#~ msgstr "Rọrun"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "Ṣayẹwo"
 
-#~ msgid "Medium"
-#~ msgstr "Alabọde"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "Ko kuro"
 
-#~ msgid "Hard"
-#~ msgstr "Lile"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Smart fo"
 
-#~ msgid "Extreme"
-#~ msgstr "Pupọ"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Tẹ lati sun-un"
 
-#~ msgid "Geography"
-#~ msgstr "Geography"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "O nwo"
 
-#~ msgid "Science"
-#~ msgstr "Iwọn"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "lati"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Lati ṣayẹwo tabi ṣafihan sẹẹli/ọrọ kan, o gbọdọ kọkọ yan sẹẹli kan"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Ọrọ (s) ko le fi sii, binu."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "Crossword adojuru - Game"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Akiyesi ọrọ (ti tunṣe)"
 
-#~ msgid "Across"
-#~ msgstr "Kọja"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "A ka ọrọ"
 
-#~ msgid "Down"
-#~ msgstr "Isalẹ"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Tẹsiwaju"
 
-#~ msgid "Reveal"
-#~ msgstr "Ifihan"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "O pari Oro Cross:"
 
-#~ msgid "Cell"
-#~ msgstr "Ẹyin sẹẹli"
-
-#~ msgid "Word"
-#~ msgstr "Ọrọ"
-
-#~ msgid "Grid"
-#~ msgstr "Akoj"
-
-#~ msgid "Check"
-#~ msgstr "Ṣayẹwo"
-
-#~ msgid "Clear"
-#~ msgstr "Ko o"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Smart fo"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Tẹ lati sun-un"
+msgid "Easy"
+msgstr "Rọrun"
 
-#~ msgid "You are viewing"
-#~ msgstr "O n wo"
+msgid "Medium"
+msgstr "Alabọde"
 
-#~ msgid "from"
-#~ msgstr "lati"
+msgid "Hard"
+msgstr "Lile"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "ọrọ(s) ko le fi sii, binu."
+msgid "Extreme"
+msgstr "Pupọ"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Iwọn ọrọ (ṣe atunṣe)"
+msgid "Geography"
+msgstr "Geography"
 
-#~ msgid "Word count"
-#~ msgstr "Iwọn ọrọ"
+msgid "Math"
+msgstr "Isiro"
 
-#~ msgid "Continue"
-#~ msgstr "Tesiwaju"
+msgid "Science"
+msgstr "Imọ"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "O pari ọrọ agbekọja!"
+msgid "Computer Science"
+msgstr "Imo komputa sayensi"
diff --git a/crossword_puzzle/locales/zh/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/zh/LC_MESSAGES/messages.mo
index e81424067..681485faa 100644
Binary files a/crossword_puzzle/locales/zh/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/zh/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/zh/LC_MESSAGES/messages.po b/crossword_puzzle/locales/zh/LC_MESSAGES/messages.po
index de5a21606..b002388ad 100644
--- a/crossword_puzzle/locales/zh/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/zh/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: zh <LL@li.org>\n"
@@ -19,188 +19,180 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "填字游戏"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "查看填字游戏"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "退出应用程序"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "全局设置"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "语言"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "尺寸"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "光"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "黑暗的"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "系统"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "外貌"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "糟糕的"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "贫穷的"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "平均的"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "伟大的"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "完美的"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "填字游戏质量"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "填字游戏浏览器"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "回去"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "加载填字游戏"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "打开网络应用程序"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "终止网络应用程序"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "字数统计偏好"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "选择字数统计"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "最大限度"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "风俗"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "要执行此操作，您必须首先选择一个单元格。"
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "看法"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "关闭"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "困难"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "总字数"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "困难"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "选择"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "重新开始"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "您确定要重新启动应用程序吗？"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "出口"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
 msgstr "您确定要退出该应用程序吗？如果 Web 应用程序正在运行，它将被终止。"
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "回到家"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
 msgstr "您确定要返回主屏幕吗？ Web 应用程序将被终止。"
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "错误"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "该语言已被选择。"
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "该尺寸已选定。"
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "此外观已选定。"
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "该质量已经选择。"
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "信息"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -217,7 +209,7 @@ msgstr ""
 "应用程序。或者，您可以手动更改程序配置文件中的端口。所有未正确终止的应用程序进程都可以通过 MacOS "
 "上的活动监视器终止，或者只需重新启动计算机即可终止它们。"
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -227,123 +219,110 @@ msgstr ""
 "加载此填字游戏的定义时出错。确保其定义 JSON 文件存在于基本 cwords "
 "目录中。注意：仅当语言环境目录中不存在其翻译版本时，才会访问基本填字游戏数据。"
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
 msgstr "填字游戏生成时发生错误。请在控制台中查看更多信息"
 
-msgid "Easy"
-msgstr "简单的"
-
-msgid "Medium"
-msgstr "中等的"
-
-msgid "Hard"
-msgstr "难的"
-
-msgid "Extreme"
-msgstr "极端"
-
-msgid "Geography"
-msgstr "地理"
-
-msgid "Math"
-msgstr "数学"
-
-msgid "Science"
-msgstr "科学"
-
-msgid "Computer Science"
-msgstr "计算机科学"
-
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
-
-#~ msgid "Capitals"
-#~ msgstr "首都"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "填字游戏 - 游戏"
 
-#~ msgid "Countries"
-#~ msgstr "国家"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "穿过"
 
-#~ msgid "Easy"
-#~ msgstr "简单的"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "向下"
 
-#~ msgid "Medium"
-#~ msgstr "中等的"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "揭示"
 
-#~ msgid "Hard"
-#~ msgstr "难的"
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "细胞"
 
-#~ msgid "Extreme"
-#~ msgstr "极端"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "单词"
 
-#~ msgid "Geography"
-#~ msgstr "地理"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "网格"
 
-#~ msgid "Science"
-#~ msgstr "尺寸"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "查看"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "要检查或显示单元格/单词，您必须首先选择一个单元格"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "清除"
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "填字游戏 - 游戏"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "聪明的跳过"
 
-#~ msgid "Across"
-#~ msgstr "穿过"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "单击缩放"
 
-#~ msgid "Down"
-#~ msgstr "向下"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "您正在查看"
 
-#~ msgid "Reveal"
-#~ msgstr "揭示"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "从"
 
-#~ msgid "Cell"
-#~ msgstr "细胞"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "对不起，无法插入单词。"
 
-#~ msgid "Word"
-#~ msgstr "单词"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "单词计数（调整后）"
 
-#~ msgid "Grid"
-#~ msgstr "网格"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "字数"
 
-#~ msgid "Check"
-#~ msgstr "查看"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "继续"
 
-#~ msgid "Clear"
-#~ msgstr "清除"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "您完成了填字游戏！"
 
-#~ msgid "Smart Skip"
-#~ msgstr "聪明的跳过"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "单击缩放"
+msgid "Easy"
+msgstr "简单的"
 
-#~ msgid "You are viewing"
-#~ msgstr "您正在查看"
+msgid "Medium"
+msgstr "中等的"
 
-#~ msgid "from"
-#~ msgstr "从"
+msgid "Hard"
+msgstr "难的"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "无法插入单词，抱歉。"
+msgid "Extreme"
+msgstr "极端"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "字数（调整后）"
+msgid "Geography"
+msgstr "地理"
 
-#~ msgid "Word count"
-#~ msgstr "字数"
+msgid "Math"
+msgstr "数学"
 
-#~ msgid "Continue"
-#~ msgstr "继续"
+msgid "Science"
+msgstr "科学"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "您完成了填字游戏！"
+msgid "Computer Science"
+msgstr "计算机科学"
diff --git a/crossword_puzzle/locales/zu/LC_MESSAGES/messages.mo b/crossword_puzzle/locales/zu/LC_MESSAGES/messages.mo
index b86bd9665..7a12b9da8 100644
Binary files a/crossword_puzzle/locales/zu/LC_MESSAGES/messages.mo and b/crossword_puzzle/locales/zu/LC_MESSAGES/messages.mo differ
diff --git a/crossword_puzzle/locales/zu/LC_MESSAGES/messages.po b/crossword_puzzle/locales/zu/LC_MESSAGES/messages.po
index a280835b9..95e1b406c 100644
--- a/crossword_puzzle/locales/zu/LC_MESSAGES/messages.po
+++ b/crossword_puzzle/locales/zu/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-05-06 11:46+1000\n"
+"POT-Creation-Date: 2024-05-06 14:57+1000\n"
 "PO-Revision-Date: 2024-02-18 13:24+1100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: zu <LL@li.org>\n"
@@ -19,147 +19,138 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.14.0\n"
 
-#: main.py:78 main.py:129 main.py:270 main.py:338
+#: crossword_puzzle/main.py:78 crossword_puzzle/main.py:129
+#: crossword_puzzle/main.py:270 crossword_puzzle/main.py:338
 msgid "Crossword Puzzle"
 msgstr "I-Crossword Puzzle"
 
-#: main.py:145
+#: crossword_puzzle/main.py:145
 msgid "View crosswords"
 msgstr "Buka amagama ahlukene"
 
-#: main.py:154
+#: crossword_puzzle/main.py:154
 msgid "Exit the app"
 msgstr "Phuma kuhlelo lokusebenza"
 
-#: main.py:165
+#: crossword_puzzle/main.py:165
 msgid "Global Settings"
 msgstr "Izilungiselelo zomhlaba jikelele"
 
-#: main.py:172
+#: crossword_puzzle/main.py:172
 msgid "Languages"
 msgstr "Izilimi"
 
-#: main.py:184
+#: crossword_puzzle/main.py:184
 msgid "Size"
 msgstr "Usayizi"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "light"
 msgstr "ukukhanya"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "dark"
 msgstr "mnyama"
 
-#: main.py:203
+#: crossword_puzzle/main.py:203
 msgid "system"
 msgstr "uhlelo"
 
-#: main.py:206 main.py:220
+#: crossword_puzzle/main.py:206 crossword_puzzle/main.py:220
 msgid "Appearance"
 msgstr "Ukubukeka"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "terrible"
 msgstr "-sabisayo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "poor"
 msgstr "-ntulayo"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "average"
 msgstr "-vamile"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "great"
 msgstr "-khulu"
 
-#: main.py:226
+#: crossword_puzzle/main.py:226
 msgid "perfect"
 msgstr "gweda"
 
-#: main.py:230
+#: crossword_puzzle/main.py:230
 msgid "Crossword Quality"
 msgstr "Ikhwalithi yamagama"
 
-#: main.py:262 main.py:415
+#: crossword_puzzle/main.py:262 crossword_puzzle/main.py:415
 msgid "Crossword Browser"
 msgstr "Isiphequluli se-Crossword"
 
-#: main.py:420
+#: crossword_puzzle/main.py:420
 msgid "Go back"
 msgstr "Buyela emuva"
 
-#: main.py:431
+#: crossword_puzzle/main.py:431
 msgid "Load crossword"
 msgstr "Layisha amagama aphambene"
 
-#: main.py:440
+#: crossword_puzzle/main.py:440
 msgid "Open web app"
 msgstr "Vula uhlelo lokusebenza lwewebhu"
 
-#: main.py:449
+#: crossword_puzzle/main.py:449
 msgid "Terminate web app"
 msgstr "Susa uhlelo lokusebenza lwewebhu"
 
-#: main.py:460
+#: crossword_puzzle/main.py:460
 msgid "Word count preferences"
 msgstr "Izinketho zenani lamagama"
 
-#: main.py:474 main.py:536 main.py:582 main.py:802
+#: crossword_puzzle/main.py:474 crossword_puzzle/main.py:536
+#: crossword_puzzle/main.py:582 crossword_puzzle/main.py:802
 msgid "Select word count"
 msgstr "Khetha isibalo samagama"
 
-#: main.py:478 main.py:581 main.py:820
-msgid "Maximum"
-msgstr "Ubuningi"
-
-#: main.py:489
+#: crossword_puzzle/main.py:489
 msgid "Custom"
 msgstr "Ngokwezifiso"
 
-#: main.py:694
+#: crossword_puzzle/main.py:694
 msgid "To perform this operation, you must first select a cell."
 msgstr "Ukwenza lo msebenzi, kufanele uqale ukhethe iseli."
 
-#: main.py:886
+#: crossword_puzzle/main.py:886
 msgid "View"
 msgstr "Buka"
 
-#: main.py:893
+#: crossword_puzzle/cword_webapp/templates/index.html:383
+#: crossword_puzzle/main.py:893
 msgid "Close"
 msgstr "Vala"
 
-#: main.py:1042 main.py:1086
+#: crossword_puzzle/main.py:1042
 msgid "difficulty"
 msgstr "ubunzima"
 
-#: main.py:1078
-msgid "Total words"
-msgstr "Ingqikithi yamagama"
-
-#: main.py:1085
-msgid "Difficulty"
-msgstr "Ubunzima"
-
-#: main.py:1098
+#: crossword_puzzle/main.py:1098
 msgid "Select"
 msgstr "Khetha"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Restart"
 msgstr "Qala kabusha"
 
-#: main.py:1150
+#: crossword_puzzle/main.py:1150
 msgid "Are you sure you want to restart the app?"
 msgstr "Uqinisekile ukuthi ufuna ukuqala kabusha uhlelo lokusebenza?"
 
-#: main.py:1156
+#: crossword_puzzle/main.py:1156
 msgid "Exit"
 msgstr "Phuma"
 
-#: main.py:1157
+#: crossword_puzzle/main.py:1157
 msgid ""
 "Are you sure you want to exit the app? If the web app is running, it will be"
 " terminated."
@@ -167,11 +158,11 @@ msgstr ""
 "Ingabe uqinisekile ukuthi ufuna ukuphuma ohlelweni lokusebenza? Uma uhlelo "
 "lokusebenza lwewebhu lusebenza, luzonqanyulwa."
 
-#: main.py:1166
+#: crossword_puzzle/main.py:1166
 msgid "Back to home"
 msgstr "Emuva ekhaya"
 
-#: main.py:1167
+#: crossword_puzzle/main.py:1167
 msgid ""
 "Are you sure you want to go back to the home screen? The web app will be "
 "terminated."
@@ -179,32 +170,33 @@ msgstr ""
 "Uqinisekile ukuthi ufuna ukubuyela esikrinini sasekhaya? Uhlelo lokusebenza "
 "lwewebhu luzonqanyulwa."
 
-#: main.py:1190 main.py:1195 main.py:1200 main.py:1205 main.py:1228
-#: main.py:1240
+#: crossword_puzzle/main.py:1190 crossword_puzzle/main.py:1195
+#: crossword_puzzle/main.py:1200 crossword_puzzle/main.py:1205
+#: crossword_puzzle/main.py:1228 crossword_puzzle/main.py:1240
 msgid "Error"
 msgstr "Iphutha"
 
-#: main.py:1190
+#: crossword_puzzle/main.py:1190
 msgid "This language is already selected."
 msgstr "Lolu limi seluvele lukhethiwe."
 
-#: main.py:1195
+#: crossword_puzzle/main.py:1195
 msgid "This size is already selected."
 msgstr "Lo sayizi usuvele ukhethiwe."
 
-#: main.py:1200
+#: crossword_puzzle/main.py:1200
 msgid "This appearance is already selected."
 msgstr "Lokhu kubonakala sekukhethiwe kakade."
 
-#: main.py:1205
+#: crossword_puzzle/main.py:1205
 msgid "This quality is already selected."
 msgstr "Le mfanelo isivele ikhethiwe."
 
-#: main.py:1210
+#: crossword_puzzle/main.py:1210
 msgid "Info"
 msgstr "Ulwazi"
 
-#: main.py:1211
+#: crossword_puzzle/main.py:1211
 msgid ""
 "First time launch, please read: Once you have loaded a crossword, and wish "
 "to load another one, you must first terminate the web app. IMPORTANT: If you"
@@ -227,7 +219,7 @@ msgstr ""
 "zinganqanyulwa Nge-Activity Monitor ku-MacOS, noma, vele uqale kabusha "
 "ikhompuyutha yakho ukuze uziqede."
 
-#: main.py:1229
+#: crossword_puzzle/main.py:1229
 msgid ""
 "An error occured while loading this crossword's definitions. Ensure that its"
 " definitions JSON file exists in the base cwords directory. NOTE: Base "
@@ -239,7 +231,7 @@ msgstr ""
 "base cwords. QAPHELA: Idatha ye-crossword eyisisekelo ifinyelelwa kuphela "
 "uma inguqulo yayo ehunyushiwe ingekho kuhla lwemibhalo lwezindawo."
 
-#: main.py:1241
+#: crossword_puzzle/main.py:1241
 msgid ""
 "An error occured in crossword generation. Please see further information in "
 "the console"
@@ -247,117 +239,104 @@ msgstr ""
 "Kwenzeke iphutha ekukhiqizeni amagama ahlukene. Sicela ubone imininingwane "
 "eyengeziwe kukhonsoli"
 
-msgid "Easy"
-msgstr "Kulula"
-
-msgid "Medium"
-msgstr "Maphakathi"
+#: crossword_puzzle/cword_webapp/templates/index.html:13
+#: crossword_puzzle/cword_webapp/templates/index.html:350
+msgid "Crossword Puzzle - Game"
+msgstr "Iphazili ye-Crossword - Game"
 
-msgid "Hard"
-msgstr "Kunzima"
+#: crossword_puzzle/cword_webapp/templates/index.html:173
+msgid "Across"
+msgstr "Phesheya"
 
-msgid "Extreme"
-msgstr "Okudlulele"
+#: crossword_puzzle/cword_webapp/templates/index.html:196
+msgid "Down"
+msgstr "Ngaphansi"
 
-msgid "Geography"
-msgstr "IJografi"
-
-msgid "Math"
-msgstr "Izibalo"
-
-msgid "Science"
-msgstr "Isayensi"
-
-msgid "Computer Science"
-msgstr "Isayensi yekhompyutha"
+#: crossword_puzzle/cword_webapp/templates/index.html:228
+msgid "Reveal"
+msgstr "Hlakukisa"
 
-#~ msgid ""
-#~ "First time launch, please read:\n"
-#~ "Once you have loaded a crossword, and wish to load another one, you must first terminate the web app.\n"
-#~ "\n"
-#~ "IMPORTANT: If you are on macOS, force quitting the application (using cmd+q) while the web app is running will prevent it from properly terminating. If you mistakenly do this, either find the Flask app process and terminate it, change the `webapp_port` number in src/config.ini, or restart your computer.\n"
-#~ "\n"
-#~ "Also important to know:\n"
-#~ "In some cases, you may have launched the web app yet your browser cannot view it. If this happens, please restart your browser."
-#~ msgstr ""
+#: crossword_puzzle/cword_webapp/templates/index.html:236
+#: crossword_puzzle/cword_webapp/templates/index.html:271
+msgid "Cell"
+msgstr "Iseli"
 
-#~ msgid "Capitals"
-#~ msgstr "Osonhlamvukazi"
+#: crossword_puzzle/cword_webapp/templates/index.html:243
+#: crossword_puzzle/cword_webapp/templates/index.html:278
+#: crossword_puzzle/cword_webapp/templates/index.html:306
+msgid "Word"
+msgstr "Uhlamvu lwegama"
 
-#~ msgid "Countries"
-#~ msgstr "Amazwe"
+#: crossword_puzzle/cword_webapp/templates/index.html:252
+#: crossword_puzzle/cword_webapp/templates/index.html:287
+#: crossword_puzzle/cword_webapp/templates/index.html:315
+msgid "Grid"
+msgstr "Igridi"
 
-#~ msgid "Easy"
-#~ msgstr "Kulula"
+#: crossword_puzzle/cword_webapp/templates/index.html:263
+msgid "Check"
+msgstr "-Hlola"
 
-#~ msgid "Medium"
-#~ msgstr "Maphakathi"
+#: crossword_puzzle/cword_webapp/templates/index.html:298
+msgid "Clear"
+msgstr "-Cwebile"
 
-#~ msgid "Hard"
-#~ msgstr "Kunzima"
+#: crossword_puzzle/cword_webapp/templates/index.html:329
+msgid "Smart Skip"
+msgstr "Skip Skip"
 
-#~ msgid "Extreme"
-#~ msgstr "Okudlulele"
+#: crossword_puzzle/cword_webapp/templates/index.html:340
+msgid "Click To Zoom"
+msgstr "Chofoza ukuze usondeze"
 
-#~ msgid "Geography"
-#~ msgstr "IJografi"
+#: crossword_puzzle/cword_webapp/templates/index.html:352
+msgid "You are viewing"
+msgstr "Uyabuka"
 
-#~ msgid "Science"
-#~ msgstr "Usayizi"
+#: crossword_puzzle/cword_webapp/templates/index.html:353
+msgid "from"
+msgstr "ukusuka"
 
-#~ msgid "To check or reveal a cell/word, you must first select a cell"
-#~ msgstr "Ukuhlola noma ukuveza iseli/igama, kufanele uqale ukhethe iseli"
+#: crossword_puzzle/cword_webapp/templates/index.html:357
+msgid "word(s) could not be inserted, sorry."
+msgstr "Amagama (s) akwazanga ukufakwa, uxolo."
 
-#~ msgid "Crossword Puzzle - Game"
-#~ msgstr "I-Crossword Puzzle - Umdlalo"
+#: crossword_puzzle/cword_webapp/templates/index.html:360
+msgid "Word count (adjusted)"
+msgstr "Ukubala kwamagama (kulungiswe)"
 
-#~ msgid "Across"
-#~ msgstr "Ngaphesheya"
+#: crossword_puzzle/cword_webapp/templates/index.html:364
+msgid "Word count"
+msgstr "Ukubala amagama"
 
-#~ msgid "Down"
-#~ msgstr "Phansi"
+#: crossword_puzzle/cword_webapp/templates/index.html:371
+msgid "Continue"
+msgstr "Qhubeka"
 
-#~ msgid "Reveal"
-#~ msgstr "Yembula"
+#: crossword_puzzle/cword_webapp/templates/index.html:377
+msgid "You completed the crossword!"
+msgstr "Uqede i-Crossword!"
 
-#~ msgid "Cell"
-#~ msgstr "Iseli"
-
-#~ msgid "Word"
-#~ msgstr "Izwi"
-
-#~ msgid "Grid"
-#~ msgstr "Igridi"
-
-#~ msgid "Check"
-#~ msgstr "Hlola"
-
-#~ msgid "Clear"
-#~ msgstr "Kucace"
-
-#~ msgid "Smart Skip"
-#~ msgstr "Skip Skip"
-
-#~ msgid "Click To Zoom"
-#~ msgstr "Chofoza ukuze usondeze"
+msgid "Easy"
+msgstr "Kulula"
 
-#~ msgid "You are viewing"
-#~ msgstr "Uyabuka"
+msgid "Medium"
+msgstr "Maphakathi"
 
-#~ msgid "from"
-#~ msgstr "kusuka"
+msgid "Hard"
+msgstr "Kunzima"
 
-#~ msgid "word(s) could not be inserted, sorry."
-#~ msgstr "(amagama) awakwazanga ukufakwa, ngiyaxolisa."
+msgid "Extreme"
+msgstr "Okudlulele"
 
-#~ msgid "Word count (adjusted)"
-#~ msgstr "Isibalo samagama (silungisiwe)"
+msgid "Geography"
+msgstr "IJografi"
 
-#~ msgid "Word count"
-#~ msgstr "Isibalo samagama"
+msgid "Math"
+msgstr "Izibalo"
 
-#~ msgid "Continue"
-#~ msgstr "Qhubeka"
+msgid "Science"
+msgstr "Isayensi"
 
-#~ msgid "You completed the crossword!"
-#~ msgstr "Uqedele i-crossword!"
+msgid "Computer Science"
+msgstr "Isayensi yekhompyutha"
diff --git a/setup.py b/setup.py
index ed8f268da..aa9b90e43 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="crossword_puzzle",
-    version="1.2.58",
+    version="1.2.59",
     author="Tomas Vana",
     url="https://github.com/tomasvana10/crossword_puzzle",
     description="Select, generate and play always-unique crosswords.",