diff --git a/assets/de.leopoldluley.Clapgrep.metainfo.xml b/assets/de.leopoldluley.Clapgrep.metainfo.xml
index 1927c6a..46913d7 100644
--- a/assets/de.leopoldluley.Clapgrep.metainfo.xml
+++ b/assets/de.leopoldluley.Clapgrep.metainfo.xml
@@ -40,14 +40,33 @@
     <display_length compare="ge">400</display_length>
     <internet>offline-only</internet>
   </requires>
-  <recommends>
-  </recommends>
   <supports>
     <control>keyboard</control>
     <control>pointing</control>
     <control>touch</control>
   </supports>
   <releases>
+    <release version="1.3" date="2024-11-15">
+      <description>
+        <p>New features:</p>
+        <ul>
+          <li>Fully adaptive UI with mobile support.</li>
+          <li>More helpful status pages.</li>
+          <li>You can now start a search just by pressing enter.</li>
+        </ul>
+        <p>New translations:</p>
+        <ul>
+          <li>Russian</li>
+        </ul>
+        <p>Bug fixes:</p>
+        <ul>
+          <li>No more searching for empty strings.</li>
+          <li>Less lag when a lot of results are added to the UI.</li>
+          <li>No more crashing when files contain null-bytes.</li>
+          <li>Use all available cores for multi-threaded search.</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.2" date="2024-10-07">
       <description>
         <p>New features:</p>
diff --git a/build-aux/de.leopoldluley.Clapgrep.json b/build-aux/de.leopoldluley.Clapgrep.json
index c1ff230..e5d5525 100644
--- a/build-aux/de.leopoldluley.Clapgrep.json
+++ b/build-aux/de.leopoldluley.Clapgrep.json
@@ -46,16 +46,13 @@
     },
     {
       "name": "clapgrep",
-      "buildsystem": "simple",
+      "no-autogen": true,
       "build-options": {
         "env": {
           "CARGO_HOME": "/run/build/clapgrep/cargo",
           "APP_ID": "de.leopoldluley.Clapgrep"
         }
       },
-      "build-commands": [
-        "make --file=build-aux/Makefile"
-      ],
       "sources": [
         {
           "type": "dir",
diff --git a/gnome/src/i18n.rs b/gnome/src/i18n.rs
new file mode 100644
index 0000000..b0c79e0
--- /dev/null
+++ b/gnome/src/i18n.rs
@@ -0,0 +1,46 @@
+use gettextrs::{gettext, ngettext};
+use std::path::PathBuf;
+
+pub fn setup_gettext() {
+    let mut text_domain = gettextrs::TextDomain::new(crate::APP_ID);
+
+    if cfg!(debug_assertions) {
+        let assets_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+            .join("..")
+            .join("assets");
+        text_domain = text_domain.push(assets_dir);
+    }
+
+    if let Err(error) = text_domain.init() {
+        println!("Failed to setup gettext: {}", error);
+    };
+}
+
+/// Like `gettext`, but replaces named variables with the given dictionary.
+///
+/// The expected format to replace is `{name}`, where `name` is the first string
+/// in the dictionary entry tuple.
+pub fn gettext_f(msgid: &str, args: &[(&str, &str)]) -> String {
+    let s = gettext(msgid);
+    freplace(s, args)
+}
+
+/// Like `ngettext`, but replaces named variables with the given dictionary.
+///
+/// The expected format to replace is `{name}`, where `name` is the first string
+/// in the dictionary entry tuple.
+#[allow(unused)]
+pub fn ngettext_f(msgid: &str, msgid_plural: &str, n: u32, args: &[(&str, &str)]) -> String {
+    let s = ngettext(msgid, msgid_plural, n);
+    freplace(s, args)
+}
+
+fn freplace(s: String, args: &[(&str, &str)]) -> String {
+    let mut s = s;
+
+    for (k, v) in args {
+        s = s.replace(&format!("{{{k}}}"), v);
+    }
+
+    s
+}
diff --git a/gnome/src/main.rs b/gnome/src/main.rs
index c191911..750258e 100644
--- a/gnome/src/main.rs
+++ b/gnome/src/main.rs
@@ -1,31 +1,16 @@
 use adw::prelude::*;
 use gtk::gio::ApplicationFlags;
-use std::path::PathBuf;
 
 mod app;
 mod config;
+mod i18n;
 mod search;
 mod ui;
 
 const APP_ID: &str = env!("APP_ID");
 
-fn setup_gettext() {
-    let mut text_domain = gettextrs::TextDomain::new(APP_ID);
-
-    if cfg!(debug_assertions) {
-        let assets_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-            .join("..")
-            .join("assets");
-        text_domain = text_domain.push(assets_dir);
-    }
-
-    if let Err(error) = text_domain.init() {
-        println!("Failed to setup gettext: {}", error);
-    };
-}
-
 fn main() {
-    setup_gettext();
+    i18n::setup_gettext();
 
     let application = adw::Application::builder()
         .application_id(APP_ID)
diff --git a/gnome/src/ui/search_window/imp.rs b/gnome/src/ui/search_window/imp.rs
index 7a529e9..f087ffb 100644
--- a/gnome/src/ui/search_window/imp.rs
+++ b/gnome/src/ui/search_window/imp.rs
@@ -1,6 +1,7 @@
-use crate::{config::Config, search::SearchModel, ui::ErrorWindow};
+use crate::{config::Config, i18n::gettext_f, search::SearchModel, ui::ErrorWindow};
 use adw::subclass::prelude::*;
 use clapgrep_core::{SearchEngine, SearchFlags, SearchMessage, SearchParameters};
+use gettextrs::gettext;
 use glib::subclass::InitializingObject;
 use gtk::{
     gio::{self, Cancellable},
@@ -126,7 +127,7 @@ impl SearchWindow {
         let initial_folder = gio::File::for_path(self.search_path.borrow().as_path());
 
         FileDialog::builder()
-            .title("Choose Search Path")
+            .title(gettext("Choose Search Path"))
             .initial_folder(&initial_folder)
             .modal(true)
             .build()
@@ -250,7 +251,13 @@ impl SearchWindow {
     fn update_search_progress(&self) {
         let files = self.searched_files.get();
         let matches = self.number_of_matches.get();
-        let message = format!("Searched {files} files and found {matches} matches");
+        let message = gettext_f(
+            "Searched {files} files and found {matches} matches",
+            &[
+                ("files", &files.to_string()),
+                ("matches", &matches.to_string()),
+            ],
+        );
 
         *self.search_progress_notification.borrow_mut() = message;
         self.obj().notify("search_progress_notification");
@@ -342,8 +349,10 @@ impl ObjectImpl for SearchWindow {
 
         obj.connect_number_of_errors_notify(|obj| {
             let errors = obj.number_of_errors();
-            *obj.imp().search_errors_notification.borrow_mut() =
-                format!("Encountered {errors} errors during search");
+            *obj.imp().search_errors_notification.borrow_mut() = gettext_f(
+                "Encountered {errors} errors during search",
+                &[("errors", &errors.to_string())],
+            );
             obj.notify("search_errors_notification")
         });
 
diff --git a/justfile b/justfile
index bcbdcb9..a342754 100644
--- a/justfile
+++ b/justfile
@@ -80,7 +80,7 @@ setup-flatpak-repos:
 	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 	flatpak install --or-update --user --noninteractive flathub org.gnome.Platform//47 org.gnome.Sdk//47 org.freedesktop.Sdk.Extension.rust-stable//24.08
 
-gettext *args:
+gettext:
   xgettext \
     --from-code=UTF-8 \
     --add-comments \
@@ -88,8 +88,12 @@ gettext *args:
     --keyword=C_:1c,2 \
     --language=C \
     --output=po/messages.pot \
-    --files-from=po/POTFILES \
-    {{args}}
+    --files-from=po/POTFILES
+  xtr \
+    --omit-header \
+    --keywords gettext \
+    --keywords gettext_f \
+    gnome/src/main.rs >> po/messages.pot
   cat po/LINGUAS | while read lang; do \
     msgmerge -N -U po/$lang.po po/messages.pot; \
     rm -f po/$lang.po~; \
diff --git a/po/POTFILES b/po/POTFILES
index ac3f67e..8250819 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,3 +1,3 @@
-gnome/src/search_window/search_window.blp
-gnome/src/error_window/error_window.blp
-gnome/src/shortcuts.blp
+gnome/src/ui/search_window/search_window.blp
+gnome/src/ui/error_window/error_window.blp
+gnome/src/ui/shortcuts/shortcuts.blp
diff --git a/po/cs.po b/po/cs.po
index 5a59b49..c4f66d2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 14:53+0200\n"
+"POT-Creation-Date: 2024-11-15 11:57+0100\n"
 "PO-Revision-Date: 2024-09-26 23:16+0200\n"
 "Last-Translator: Amerey <info@amerey.eu>\n"
 "Language-Team: \n"
@@ -18,114 +18,133 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.4.4\n"
 
-#: gnome/src/search_window/search_window.blp:5
+#: gnome/src/ui/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr "Clapgrep"
 
-#: gnome/src/search_window/search_window.blp:9
+#: gnome/src/ui/search_window/search_window.blp:18
 msgid "Search Settings"
 msgstr "Nastavení vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:28
+#: gnome/src/ui/search_window/search_window.blp:41
 msgid "Search Pattern"
 msgstr "Vzor vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
+#: gnome/src/ui/search_window/search_window.blp:47
+#: gnome/src/ui/shortcuts/shortcuts.blp:28
 msgid "Start Search"
 msgstr "Spustit vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:41
+#: gnome/src/ui/search_window/search_window.blp:55
 msgid "Search Path"
 msgstr "Cesta vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:59
+#: gnome/src/ui/search_window/search_window.blp:73
 msgid "Search Options"
 msgstr "Možnosti vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:62
+#: gnome/src/ui/search_window/search_window.blp:76
 msgid "Case Sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
-#: gnome/src/search_window/search_window.blp:67
+#: gnome/src/ui/search_window/search_window.blp:81
 msgid "Disable Regex"
 msgstr "Zakázat Regex"
 
-#: gnome/src/search_window/search_window.blp:72
+#: gnome/src/ui/search_window/search_window.blp:86
 msgid "Include Hidden"
 msgstr "Zahrnout skryté"
 
-#: gnome/src/search_window/search_window.blp:77
+#: gnome/src/ui/search_window/search_window.blp:91
 msgid "Include Ignored"
 msgstr "Zahrnout ignorované"
 
-#: gnome/src/search_window/search_window.blp:83
+#: gnome/src/ui/search_window/search_window.blp:97
 msgid "Extra File Formats"
 msgstr "Extra formáty souborů"
 
-#: gnome/src/search_window/search_window.blp:86
+#: gnome/src/ui/search_window/search_window.blp:100
 msgid "PDF files"
 msgstr "PDF soubory"
 
-#: gnome/src/search_window/search_window.blp:91
+#: gnome/src/ui/search_window/search_window.blp:105
 msgid "Office files"
 msgstr "Soubory Office"
 
-#: gnome/src/search_window/search_window.blp:97
-msgid "Current Search"
-msgstr "Aktuální vyhledávání"
+#: gnome/src/ui/search_window/search_window.blp:116
+msgid "Search Results"
+msgstr "Výsledky vyhledávání"
+
+#: gnome/src/ui/search_window/search_window.blp:136
+msgid "No Search Yet"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:102
-msgid "Searched Files"
-msgstr "Hledané soubory"
+#: gnome/src/ui/search_window/search_window.blp:137
+msgid "Try to start a search"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:111
-msgid "Number of Matches"
-msgstr "Počet shod"
+#: gnome/src/ui/search_window/search_window.blp:146
+msgid "No Results"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:120
-msgid "Errors Encountered"
-msgstr "Zjištěné chyby"
+#: gnome/src/ui/search_window/search_window.blp:152
+msgid ""
+"You might want to try changing your search pattern, activating document "
+"search, or changing to a different directory"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:133
+#: gnome/src/ui/search_window/search_window.blp:182
 msgid "Cancel Search"
 msgstr "Zrušit vyhledávání"
 
-#: gnome/src/search_window/search_window.blp:148
-msgid "Search Results"
-msgstr "Výsledky vyhledávání"
+#: gnome/src/ui/search_window/search_window.blp:201
+msgid "Show Errors"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:238
+#: gnome/src/ui/search_window/search_window.blp:284
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: gnome/src/search_window/search_window.blp:243
+#: gnome/src/ui/search_window/search_window.blp:289
 msgid "About Clapgrep"
 msgstr "O Clapgrep"
 
-#: gnome/src/error_window/error_window.blp:7
+#: gnome/src/ui/error_window/error_window.blp:7
 msgid "Search Errors"
 msgstr "Chyby vyhledávání"
 
-#: gnome/src/shortcuts.blp:5
+#: gnome/src/ui/shortcuts/shortcuts.blp:5
 msgid "Clapgrep Shortcuts"
 msgstr "Zkratky Clapgrep"
 
-#: gnome/src/shortcuts.blp:9
+#: gnome/src/ui/shortcuts/shortcuts.blp:9
 msgid "General"
 msgstr "Obecné"
 
-#: gnome/src/shortcuts.blp:12
+#: gnome/src/ui/shortcuts/shortcuts.blp:12
 msgid "Quit"
 msgstr "Konec"
 
-#: gnome/src/shortcuts.blp:18
+#: gnome/src/ui/shortcuts/shortcuts.blp:18
 msgid "Shortcuts"
 msgstr "Zkratky"
 
-#: gnome/src/shortcuts.blp:25
+#: gnome/src/ui/shortcuts/shortcuts.blp:25
 msgid "Control Search"
 msgstr "Ovládání vyhledávání"
 
-#: gnome/src/shortcuts.blp:34
+#: gnome/src/ui/shortcuts/shortcuts.blp:34
 msgid "Stop Search"
 msgstr "Zastavit vyhledávání"
+
+#~ msgid "Current Search"
+#~ msgstr "Aktuální vyhledávání"
+
+#~ msgid "Searched Files"
+#~ msgstr "Hledané soubory"
+
+#~ msgid "Number of Matches"
+#~ msgstr "Počet shod"
+
+#~ msgid "Errors Encountered"
+#~ msgstr "Zjištěné chyby"
diff --git a/po/de.po b/po/de.po
index e6bba2c..bb1556c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: Clapgrep 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 14:53+0200\n"
-"PO-Revision-Date: 2024-09-03 22:00+0200\n"
+"POT-Creation-Date: 2024-11-15 11:57+0100\n"
+"PO-Revision-Date: 2024-11-15 12:04+0100\n"
 "Last-Translator: Leopold Luley <git@leopoldluley.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "Language: de\n"
@@ -17,114 +17,135 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnome/src/search_window/search_window.blp:5
+#: gnome/src/ui/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr "Clapgrep"
 
-#: gnome/src/search_window/search_window.blp:9
+#: gnome/src/ui/search_window/search_window.blp:18
 msgid "Search Settings"
 msgstr "Sucheinstellungen"
 
-#: gnome/src/search_window/search_window.blp:28
+#: gnome/src/ui/search_window/search_window.blp:41
 msgid "Search Pattern"
 msgstr "Suchmaske"
 
-#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
+#: gnome/src/ui/search_window/search_window.blp:47
+#: gnome/src/ui/shortcuts/shortcuts.blp:28
 msgid "Start Search"
 msgstr "Suche beginnen"
 
-#: gnome/src/search_window/search_window.blp:41
+#: gnome/src/ui/search_window/search_window.blp:55
 msgid "Search Path"
 msgstr "Suchpfad"
 
-#: gnome/src/search_window/search_window.blp:59
+#: gnome/src/ui/search_window/search_window.blp:73
 msgid "Search Options"
 msgstr "Suchoptionen"
 
-#: gnome/src/search_window/search_window.blp:62
+#: gnome/src/ui/search_window/search_window.blp:76
 msgid "Case Sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: gnome/src/search_window/search_window.blp:67
+#: gnome/src/ui/search_window/search_window.blp:81
 msgid "Disable Regex"
 msgstr "Regex deaktivieren"
 
-#: gnome/src/search_window/search_window.blp:72
+#: gnome/src/ui/search_window/search_window.blp:86
 msgid "Include Hidden"
 msgstr "Versteckte Dateien hinzunehmen"
 
-#: gnome/src/search_window/search_window.blp:77
+#: gnome/src/ui/search_window/search_window.blp:91
 msgid "Include Ignored"
 msgstr "Ignorierte Dateien hinzunehmen"
 
-#: gnome/src/search_window/search_window.blp:83
+#: gnome/src/ui/search_window/search_window.blp:97
 msgid "Extra File Formats"
 msgstr "Zusätzliche Dateiformate"
 
-#: gnome/src/search_window/search_window.blp:86
+#: gnome/src/ui/search_window/search_window.blp:100
 msgid "PDF files"
 msgstr "PDF Dateien"
 
-#: gnome/src/search_window/search_window.blp:91
+#: gnome/src/ui/search_window/search_window.blp:105
 msgid "Office files"
 msgstr "Office Dateien"
 
-#: gnome/src/search_window/search_window.blp:97
-msgid "Current Search"
-msgstr "Aktuelle Suche"
+#: gnome/src/ui/search_window/search_window.blp:116
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: gnome/src/ui/search_window/search_window.blp:136
+msgid "No Search Yet"
+msgstr "Noch keine Suche begonnen"
 
-#: gnome/src/search_window/search_window.blp:102
-msgid "Searched Files"
-msgstr "Durchsuchte Dateien"
+#: gnome/src/ui/search_window/search_window.blp:137
+msgid "Try to start a search"
+msgstr "Versuche, eine Suche zu starten"
 
-#: gnome/src/search_window/search_window.blp:111
-msgid "Number of Matches"
-msgstr "Anzahl Treffer"
+#: gnome/src/ui/search_window/search_window.blp:146
+msgid "No Results"
+msgstr "Keine Ergebnisse"
 
-#: gnome/src/search_window/search_window.blp:120
-msgid "Errors Encountered"
-msgstr "Fehler"
+#: gnome/src/ui/search_window/search_window.blp:152
+msgid ""
+"You might want to try changing your search pattern, activating document "
+"search, or changing to a different directory"
+msgstr ""
+"Du kannst eine andere Suchmaske versuche, die Dokumentensuche "
+"aktivieren, oder zu einem anderen Suchordner wechseln"
 
-#: gnome/src/search_window/search_window.blp:133
+#: gnome/src/ui/search_window/search_window.blp:182
 msgid "Cancel Search"
 msgstr "Suche abbrechen"
 
-#: gnome/src/search_window/search_window.blp:148
-msgid "Search Results"
-msgstr "Suchergebnisse"
+#: gnome/src/ui/search_window/search_window.blp:201
+msgid "Show Errors"
+msgstr "Fehler anzeigen"
 
-#: gnome/src/search_window/search_window.blp:238
+#: gnome/src/ui/search_window/search_window.blp:284
 msgid "Keyboard Shortcuts"
 msgstr "Tastenbindungen"
 
-#: gnome/src/search_window/search_window.blp:243
+#: gnome/src/ui/search_window/search_window.blp:289
 msgid "About Clapgrep"
 msgstr "Über Clapgrep"
 
-#: gnome/src/error_window/error_window.blp:7
+#: gnome/src/ui/error_window/error_window.blp:7
 msgid "Search Errors"
 msgstr "Suchfehler"
 
-#: gnome/src/shortcuts.blp:5
+#: gnome/src/ui/shortcuts/shortcuts.blp:5
 msgid "Clapgrep Shortcuts"
 msgstr "Clapgrep Tastenbindungen"
 
-#: gnome/src/shortcuts.blp:9
+#: gnome/src/ui/shortcuts/shortcuts.blp:9
 msgid "General"
 msgstr "Generell"
 
-#: gnome/src/shortcuts.blp:12
+#: gnome/src/ui/shortcuts/shortcuts.blp:12
 msgid "Quit"
 msgstr "Beenden"
 
-#: gnome/src/shortcuts.blp:18
+#: gnome/src/ui/shortcuts/shortcuts.blp:18
 msgid "Shortcuts"
 msgstr "Tastenbindungen"
 
-#: gnome/src/shortcuts.blp:25
+#: gnome/src/ui/shortcuts/shortcuts.blp:25
 msgid "Control Search"
 msgstr "Suche steuern"
 
-#: gnome/src/shortcuts.blp:34
+#: gnome/src/ui/shortcuts/shortcuts.blp:34
 msgid "Stop Search"
 msgstr "Suche anhalten"
+
+#~ msgid "Current Search"
+#~ msgstr "Aktuelle Suche"
+
+#~ msgid "Searched Files"
+#~ msgstr "Durchsuchte Dateien"
+
+#~ msgid "Number of Matches"
+#~ msgstr "Anzahl Treffer"
+
+#~ msgid "Errors Encountered"
+#~ msgstr "Fehler"
diff --git a/po/it.po b/po/it.po
index 5fbd3b4..c6c2f7a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 14:53+0200\n"
+"POT-Creation-Date: 2024-11-15 11:57+0100\n"
 "PO-Revision-Date: 2024-09-24 20:41+0100\n"
 "Last-Translator: Albano Battistella <albanobattistella@gmail.com>\n"
 "Language-Team: Italian <LL@li.org>\n"
@@ -16,114 +16,133 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome/src/search_window/search_window.blp:5
+#: gnome/src/ui/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr "Clapgrep"
 
-#: gnome/src/search_window/search_window.blp:9
+#: gnome/src/ui/search_window/search_window.blp:18
 msgid "Search Settings"
 msgstr "Impostazioni di ricerca"
 
-#: gnome/src/search_window/search_window.blp:28
+#: gnome/src/ui/search_window/search_window.blp:41
 msgid "Search Pattern"
 msgstr "Modello di ricerca"
 
-#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
+#: gnome/src/ui/search_window/search_window.blp:47
+#: gnome/src/ui/shortcuts/shortcuts.blp:28
 msgid "Start Search"
 msgstr "Avvia ricerca"
 
-#: gnome/src/search_window/search_window.blp:41
+#: gnome/src/ui/search_window/search_window.blp:55
 msgid "Search Path"
 msgstr "Percorso di ricerca"
 
-#: gnome/src/search_window/search_window.blp:59
+#: gnome/src/ui/search_window/search_window.blp:73
 msgid "Search Options"
 msgstr "Opzioni di ricerca"
 
-#: gnome/src/search_window/search_window.blp:62
+#: gnome/src/ui/search_window/search_window.blp:76
 msgid "Case Sensitive"
 msgstr "Maiuscole e minuscole"
 
-#: gnome/src/search_window/search_window.blp:67
+#: gnome/src/ui/search_window/search_window.blp:81
 msgid "Disable Regex"
 msgstr "Disabilita Regex"
 
-#: gnome/src/search_window/search_window.blp:72
+#: gnome/src/ui/search_window/search_window.blp:86
 msgid "Include Hidden"
 msgstr "Includi nascosti"
 
-#: gnome/src/search_window/search_window.blp:77
+#: gnome/src/ui/search_window/search_window.blp:91
 msgid "Include Ignored"
 msgstr "Includi ignorati"
 
-#: gnome/src/search_window/search_window.blp:83
+#: gnome/src/ui/search_window/search_window.blp:97
 msgid "Extra File Formats"
 msgstr "Formati di file extra"
 
-#: gnome/src/search_window/search_window.blp:86
+#: gnome/src/ui/search_window/search_window.blp:100
 msgid "PDF files"
 msgstr "File PDF"
 
-#: gnome/src/search_window/search_window.blp:91
+#: gnome/src/ui/search_window/search_window.blp:105
 msgid "Office files"
 msgstr "File di ufficio"
 
-#: gnome/src/search_window/search_window.blp:97
-msgid "Current Search"
-msgstr "Ricerca corrente"
+#: gnome/src/ui/search_window/search_window.blp:116
+msgid "Search Results"
+msgstr "Risultati della ricerca"
+
+#: gnome/src/ui/search_window/search_window.blp:136
+msgid "No Search Yet"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:102
-msgid "Searched Files"
-msgstr "File ricercati"
+#: gnome/src/ui/search_window/search_window.blp:137
+msgid "Try to start a search"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:111
-msgid "Number of Matches"
-msgstr "Numero di corrispondenze"
+#: gnome/src/ui/search_window/search_window.blp:146
+msgid "No Results"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:120
-msgid "Errors Encountered"
-msgstr "Errori riscontrati"
+#: gnome/src/ui/search_window/search_window.blp:152
+msgid ""
+"You might want to try changing your search pattern, activating document "
+"search, or changing to a different directory"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:133
+#: gnome/src/ui/search_window/search_window.blp:182
 msgid "Cancel Search"
 msgstr "Annulla ricerca"
 
-#: gnome/src/search_window/search_window.blp:148
-msgid "Search Results"
-msgstr "Risultati della ricerca"
+#: gnome/src/ui/search_window/search_window.blp:201
+msgid "Show Errors"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:238
+#: gnome/src/ui/search_window/search_window.blp:284
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: gnome/src/search_window/search_window.blp:243
+#: gnome/src/ui/search_window/search_window.blp:289
 msgid "About Clapgrep"
 msgstr "Informazioni sulla Clapgrep"
 
-#: gnome/src/error_window/error_window.blp:7
+#: gnome/src/ui/error_window/error_window.blp:7
 msgid "Search Errors"
 msgstr "Errori di ricerca"
 
-#: gnome/src/shortcuts.blp:5
+#: gnome/src/ui/shortcuts/shortcuts.blp:5
 msgid "Clapgrep Shortcuts"
 msgstr "Scorciatoie di Clapgrep"
 
-#: gnome/src/shortcuts.blp:9
+#: gnome/src/ui/shortcuts/shortcuts.blp:9
 msgid "General"
 msgstr "Generale"
 
-#: gnome/src/shortcuts.blp:12
+#: gnome/src/ui/shortcuts/shortcuts.blp:12
 msgid "Quit"
 msgstr "Esci"
 
-#: gnome/src/shortcuts.blp:18
+#: gnome/src/ui/shortcuts/shortcuts.blp:18
 msgid "Shortcuts"
 msgstr "Scorciatoie"
 
-#: gnome/src/shortcuts.blp:25
+#: gnome/src/ui/shortcuts/shortcuts.blp:25
 msgid "Control Search"
 msgstr "Ricerca di controllo"
 
-#: gnome/src/shortcuts.blp:34
+#: gnome/src/ui/shortcuts/shortcuts.blp:34
 msgid "Stop Search"
 msgstr "Ferma ricerca"
+
+#~ msgid "Current Search"
+#~ msgstr "Ricerca corrente"
+
+#~ msgid "Searched Files"
+#~ msgstr "File ricercati"
+
+#~ msgid "Number of Matches"
+#~ msgstr "Numero di corrispondenze"
+
+#~ msgid "Errors Encountered"
+#~ msgstr "Errori riscontrati"
diff --git a/po/messages.pot b/po/messages.pot
index 8670d2f..c2433a2 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 14:53+0200\n"
+"POT-Creation-Date: 2024-11-15 11:57+0100\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,114 +17,121 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnome/src/search_window/search_window.blp:5
+#: gnome/src/ui/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:9
+#: gnome/src/ui/search_window/search_window.blp:18
 msgid "Search Settings"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:28
+#: gnome/src/ui/search_window/search_window.blp:41
 msgid "Search Pattern"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
+#: gnome/src/ui/search_window/search_window.blp:47
+#: gnome/src/ui/shortcuts/shortcuts.blp:28
 msgid "Start Search"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:41
+#: gnome/src/ui/search_window/search_window.blp:55
 msgid "Search Path"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:59
+#: gnome/src/ui/search_window/search_window.blp:73
 msgid "Search Options"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:62
+#: gnome/src/ui/search_window/search_window.blp:76
 msgid "Case Sensitive"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:67
+#: gnome/src/ui/search_window/search_window.blp:81
 msgid "Disable Regex"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:72
+#: gnome/src/ui/search_window/search_window.blp:86
 msgid "Include Hidden"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:77
+#: gnome/src/ui/search_window/search_window.blp:91
 msgid "Include Ignored"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:83
+#: gnome/src/ui/search_window/search_window.blp:97
 msgid "Extra File Formats"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:86
+#: gnome/src/ui/search_window/search_window.blp:100
 msgid "PDF files"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:91
+#: gnome/src/ui/search_window/search_window.blp:105
 msgid "Office files"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:97
-msgid "Current Search"
+#: gnome/src/ui/search_window/search_window.blp:116
+msgid "Search Results"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:102
-msgid "Searched Files"
+#: gnome/src/ui/search_window/search_window.blp:136
+msgid "No Search Yet"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:111
-msgid "Number of Matches"
+#: gnome/src/ui/search_window/search_window.blp:137
+msgid "Try to start a search"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:120
-msgid "Errors Encountered"
+#: gnome/src/ui/search_window/search_window.blp:146
+msgid "No Results"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:133
+#: gnome/src/ui/search_window/search_window.blp:152
+msgid ""
+"You might want to try changing your search pattern, activating document "
+"search, or changing to a different directory"
+msgstr ""
+
+#: gnome/src/ui/search_window/search_window.blp:182
 msgid "Cancel Search"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:148
-msgid "Search Results"
+#: gnome/src/ui/search_window/search_window.blp:201
+msgid "Show Errors"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:238
+#: gnome/src/ui/search_window/search_window.blp:284
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:243
+#: gnome/src/ui/search_window/search_window.blp:289
 msgid "About Clapgrep"
 msgstr ""
 
-#: gnome/src/error_window/error_window.blp:7
+#: gnome/src/ui/error_window/error_window.blp:7
 msgid "Search Errors"
 msgstr ""
 
-#: gnome/src/shortcuts.blp:5
+#: gnome/src/ui/shortcuts/shortcuts.blp:5
 msgid "Clapgrep Shortcuts"
 msgstr ""
 
-#: gnome/src/shortcuts.blp:9
+#: gnome/src/ui/shortcuts/shortcuts.blp:9
 msgid "General"
 msgstr ""
 
-#: gnome/src/shortcuts.blp:12
+#: gnome/src/ui/shortcuts/shortcuts.blp:12
 msgid "Quit"
 msgstr ""
 
-#: gnome/src/shortcuts.blp:18
+#: gnome/src/ui/shortcuts/shortcuts.blp:18
 msgid "Shortcuts"
 msgstr ""
 
-#: gnome/src/shortcuts.blp:25
+#: gnome/src/ui/shortcuts/shortcuts.blp:25
 msgid "Control Search"
 msgstr ""
 
-#: gnome/src/shortcuts.blp:34
+#: gnome/src/ui/shortcuts/shortcuts.blp:34
 msgid "Stop Search"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 7781b4a..91adac2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-02 14:53+0200\n"
+"POT-Creation-Date: 2024-11-15 11:57+0100\n"
 "PO-Revision-Date: 2024-10-26 23:27+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -15,117 +15,137 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
 "X-Generator: Poedit 3.2.2\n"
 
-#: gnome/src/search_window/search_window.blp:5
+#: gnome/src/ui/search_window/search_window.blp:5
 msgid "Clapgrep"
 msgstr ""
 
-#: gnome/src/search_window/search_window.blp:9
+#: gnome/src/ui/search_window/search_window.blp:18
 msgid "Search Settings"
 msgstr "Настройки поиска"
 
-#: gnome/src/search_window/search_window.blp:28
+#: gnome/src/ui/search_window/search_window.blp:41
 msgid "Search Pattern"
 msgstr "Шаблон поиска"
 
-#: gnome/src/search_window/search_window.blp:33 gnome/src/shortcuts.blp:28
+#: gnome/src/ui/search_window/search_window.blp:47
+#: gnome/src/ui/shortcuts/shortcuts.blp:28
 msgid "Start Search"
 msgstr "Начать поиск"
 
-#: gnome/src/search_window/search_window.blp:41
+#: gnome/src/ui/search_window/search_window.blp:55
 msgid "Search Path"
 msgstr "Путь поиска"
 
-#: gnome/src/search_window/search_window.blp:59
+#: gnome/src/ui/search_window/search_window.blp:73
 msgid "Search Options"
 msgstr "Параметры поиска"
 
-#: gnome/src/search_window/search_window.blp:62
+#: gnome/src/ui/search_window/search_window.blp:76
 msgid "Case Sensitive"
 msgstr "С учетом регистра"
 
-#: gnome/src/search_window/search_window.blp:67
+#: gnome/src/ui/search_window/search_window.blp:81
 msgid "Disable Regex"
 msgstr "Отключить регулярное выражение"
 
-#: gnome/src/search_window/search_window.blp:72
+#: gnome/src/ui/search_window/search_window.blp:86
 msgid "Include Hidden"
 msgstr "Включать скрытые"
 
-#: gnome/src/search_window/search_window.blp:77
+#: gnome/src/ui/search_window/search_window.blp:91
 msgid "Include Ignored"
 msgstr "Включить игнорируемые"
 
-#: gnome/src/search_window/search_window.blp:83
+#: gnome/src/ui/search_window/search_window.blp:97
 msgid "Extra File Formats"
 msgstr "Дополнительные форматы файлов"
 
-#: gnome/src/search_window/search_window.blp:86
+#: gnome/src/ui/search_window/search_window.blp:100
 msgid "PDF files"
 msgstr "PDF файлы"
 
-#: gnome/src/search_window/search_window.blp:91
+#: gnome/src/ui/search_window/search_window.blp:105
 msgid "Office files"
 msgstr "Файлы Office"
 
-#: gnome/src/search_window/search_window.blp:97
-msgid "Current Search"
-msgstr "Текущий поиск"
+#: gnome/src/ui/search_window/search_window.blp:116
+msgid "Search Results"
+msgstr "Результаты поиска"
+
+#: gnome/src/ui/search_window/search_window.blp:136
+msgid "No Search Yet"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:102
-msgid "Searched Files"
-msgstr "Найденные файлы"
+#: gnome/src/ui/search_window/search_window.blp:137
+msgid "Try to start a search"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:111
-msgid "Number of Matches"
-msgstr "Количество совпадений"
+#: gnome/src/ui/search_window/search_window.blp:146
+msgid "No Results"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:120
-msgid "Errors Encountered"
-msgstr "Возникшие ошибки"
+#: gnome/src/ui/search_window/search_window.blp:152
+msgid ""
+"You might want to try changing your search pattern, activating document "
+"search, or changing to a different directory"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:133
+#: gnome/src/ui/search_window/search_window.blp:182
 msgid "Cancel Search"
 msgstr "Отменить поиск"
 
-#: gnome/src/search_window/search_window.blp:148
-msgid "Search Results"
-msgstr "Результаты поиска"
+#: gnome/src/ui/search_window/search_window.blp:201
+msgid "Show Errors"
+msgstr ""
 
-#: gnome/src/search_window/search_window.blp:238
+#: gnome/src/ui/search_window/search_window.blp:284
 msgid "Keyboard Shortcuts"
 msgstr "Комбинации клавиш"
 
-#: gnome/src/search_window/search_window.blp:243
+#: gnome/src/ui/search_window/search_window.blp:289
 msgid "About Clapgrep"
 msgstr "О программе  Clapgrep"
 
-#: gnome/src/error_window/error_window.blp:7
+#: gnome/src/ui/error_window/error_window.blp:7
 msgid "Search Errors"
 msgstr "Ошибки поиска"
 
-#: gnome/src/shortcuts.blp:5
+#: gnome/src/ui/shortcuts/shortcuts.blp:5
 msgid "Clapgrep Shortcuts"
 msgstr "Метки Clapgrep"
 
-#: gnome/src/shortcuts.blp:9
+#: gnome/src/ui/shortcuts/shortcuts.blp:9
 msgid "General"
 msgstr "Основные"
 
-#: gnome/src/shortcuts.blp:12
+#: gnome/src/ui/shortcuts/shortcuts.blp:12
 msgid "Quit"
 msgstr "Выйти"
 
-#: gnome/src/shortcuts.blp:18
+#: gnome/src/ui/shortcuts/shortcuts.blp:18
 msgid "Shortcuts"
 msgstr "Комбинации клавиш"
 
-#: gnome/src/shortcuts.blp:25
+#: gnome/src/ui/shortcuts/shortcuts.blp:25
 msgid "Control Search"
 msgstr "Управление поиском"
 
-#: gnome/src/shortcuts.blp:34
+#: gnome/src/ui/shortcuts/shortcuts.blp:34
 msgid "Stop Search"
 msgstr "Остановить поиск"
+
+#~ msgid "Current Search"
+#~ msgstr "Текущий поиск"
+
+#~ msgid "Searched Files"
+#~ msgstr "Найденные файлы"
+
+#~ msgid "Number of Matches"
+#~ msgstr "Количество совпадений"
+
+#~ msgid "Errors Encountered"
+#~ msgstr "Возникшие ошибки"