diff --git a/setup-and-run-mobile-app/configuration-1-1.png b/setup-and-run-mobile-app/configuration-1-1.png
new file mode 100644
index 0000000..960b18a
Binary files /dev/null and b/setup-and-run-mobile-app/configuration-1-1.png differ
diff --git a/setup-and-run-mobile-app/configuration-2-1.png b/setup-and-run-mobile-app/configuration-2-1.png
new file mode 100644
index 0000000..52b45ee
Binary files /dev/null and b/setup-and-run-mobile-app/configuration-2-1.png differ
diff --git a/setup-and-run-mobile-app/configuration-3-1.png b/setup-and-run-mobile-app/configuration-3-1.png
new file mode 100644
index 0000000..863fdc1
Binary files /dev/null and b/setup-and-run-mobile-app/configuration-3-1.png differ
diff --git a/setup-and-run-mobile-app/configuration-4-1-1.png b/setup-and-run-mobile-app/configuration-4-1-1.png
new file mode 100644
index 0000000..08c5f1c
Binary files /dev/null and b/setup-and-run-mobile-app/configuration-4-1-1.png differ
diff --git a/setup-and-run-mobile-app/configuration-4-2-1.png b/setup-and-run-mobile-app/configuration-4-2-1.png
new file mode 100644
index 0000000..2880915
Binary files /dev/null and b/setup-and-run-mobile-app/configuration-4-2-1.png differ
diff --git a/setup-and-run-mobile-app/configuration-5-1.png b/setup-and-run-mobile-app/configuration-5-1.png
new file mode 100644
index 0000000..788e978
Binary files /dev/null and b/setup-and-run-mobile-app/configuration-5-1.png differ
diff --git a/setup-and-run-mobile-app/first-run-1.png b/setup-and-run-mobile-app/first-run-1.png
new file mode 100644
index 0000000..e857b7a
Binary files /dev/null and b/setup-and-run-mobile-app/first-run-1.png differ
diff --git a/setup-and-run-mobile-app/group-app-configuration-1-1.png b/setup-and-run-mobile-app/group-app-configuration-1-1.png
deleted file mode 100644
index 48f0621..0000000
Binary files a/setup-and-run-mobile-app/group-app-configuration-1-1.png and /dev/null differ
diff --git a/setup-and-run-mobile-app/group-app-configuration-2-1.png b/setup-and-run-mobile-app/group-app-configuration-2-1.png
deleted file mode 100644
index 5db42d7..0000000
Binary files a/setup-and-run-mobile-app/group-app-configuration-2-1.png and /dev/null differ
diff --git a/setup-and-run-mobile-app/group-app-first-startup-1.png b/setup-and-run-mobile-app/group-app-first-startup-1.png
deleted file mode 100644
index fe53e0e..0000000
Binary files a/setup-and-run-mobile-app/group-app-first-startup-1.png and /dev/null differ
diff --git a/setup-and-run-mobile-app/group-app-instalation-1.png b/setup-and-run-mobile-app/group-app-instalation-1.png
deleted file mode 100644
index 3a67e6a..0000000
Binary files a/setup-and-run-mobile-app/group-app-instalation-1.png and /dev/null differ
diff --git a/setup-and-run-mobile-app/install-1-1.png b/setup-and-run-mobile-app/install-1-1.png
new file mode 100644
index 0000000..7ab65ee
Binary files /dev/null and b/setup-and-run-mobile-app/install-1-1.png differ
diff --git a/setup-and-run-mobile-app/install-2-1.png b/setup-and-run-mobile-app/install-2-1.png
new file mode 100644
index 0000000..3696b49
Binary files /dev/null and b/setup-and-run-mobile-app/install-2-1.png differ
diff --git a/setup-and-run-mobile-app/map-activity-1.png b/setup-and-run-mobile-app/map-activity-1.png
new file mode 100644
index 0000000..504a26a
Binary files /dev/null and b/setup-and-run-mobile-app/map-activity-1.png differ
diff --git a/setup-and-run-mobile-app/control-center-power-settings-turned-off-1.jpg b/setup-and-run-mobile-app/raw-screenshots/control-center-power-settings-turned-off-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/control-center-power-settings-turned-off-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/control-center-power-settings-turned-off-1.jpg
diff --git a/setup-and-run-mobile-app/home-screen-play-store-1.jpg b/setup-and-run-mobile-app/raw-screenshots/home-screen-play-store-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/home-screen-play-store-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/home-screen-play-store-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-active-map-view-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-active-map-view-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-active-map-view-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-active-map-view-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-activity-drawer-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-activity-drawer-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-activity-drawer-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-activity-drawer-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-allow-background-location-modal-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-allow-background-location-modal-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-allow-background-location-modal-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-allow-background-location-modal-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-allow-location-drawer-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-allow-location-drawer-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-allow-location-drawer-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-allow-location-drawer-1.jpg
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-1-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-1-1.png
new file mode 100644
index 0000000..dd23708
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-1-1.png differ
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-2-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-2-1.png
new file mode 100644
index 0000000..997de2f
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-2-1.png differ
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-3-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-3-1.png
new file mode 100644
index 0000000..1b38739
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-3-1.png differ
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-4-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-4-1.png
new file mode 100644
index 0000000..a6b79f2
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-4-1.png differ
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-5-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-5-1.png
new file mode 100644
index 0000000..0519b50
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-5-1.png differ
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-6-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-6-1.png
new file mode 100644
index 0000000..0ae2c7e
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-6-1.png differ
diff --git a/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-7-1.png b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-7-1.png
new file mode 100644
index 0000000..69675d1
Binary files /dev/null and b/setup-and-run-mobile-app/raw-screenshots/lastmiler-disable-battery-optimization-7-1.png differ
diff --git a/setup-and-run-mobile-app/lastmiler-home-screen-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-home-screen-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-home-screen-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-home-screen-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-login-screen-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-login-screen-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-login-screen-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-login-screen-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-my-active-maps-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-my-active-maps-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-my-active-maps-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-my-active-maps-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-privacy-policy-modal-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-privacy-policy-modal-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-privacy-policy-modal-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-privacy-policy-modal-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-tracking-screen-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-tracking-screen-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-tracking-screen-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-tracking-screen-1.jpg
diff --git a/setup-and-run-mobile-app/lastmiler-tracking-screen-active-tracking-1.jpg b/setup-and-run-mobile-app/raw-screenshots/lastmiler-tracking-screen-active-tracking-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/lastmiler-tracking-screen-active-tracking-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/lastmiler-tracking-screen-active-tracking-1.jpg
diff --git a/setup-and-run-mobile-app/play-store-lastmielr-search-1.jpg b/setup-and-run-mobile-app/raw-screenshots/play-store-lastmielr-search-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/play-store-lastmielr-search-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/play-store-lastmielr-search-1.jpg
diff --git a/setup-and-run-mobile-app/play-store-lastmiler-page-1.jpg b/setup-and-run-mobile-app/raw-screenshots/play-store-lastmiler-page-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/play-store-lastmiler-page-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/play-store-lastmiler-page-1.jpg
diff --git a/setup-and-run-mobile-app/play-store-lastmiler-search-results-1.jpg b/setup-and-run-mobile-app/raw-screenshots/play-store-lastmiler-search-results-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/play-store-lastmiler-search-results-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/play-store-lastmiler-search-results-1.jpg
diff --git a/setup-and-run-mobile-app/system-settings-app-search-list-lastmiler-1.jpg b/setup-and-run-mobile-app/raw-screenshots/system-settings-app-search-list-lastmiler-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-app-search-list-lastmiler-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-app-search-list-lastmiler-1.jpg
diff --git a/setup-and-run-mobile-app/system-settings-apps-search-1.jpg b/setup-and-run-mobile-app/raw-screenshots/system-settings-apps-search-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-apps-search-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-apps-search-1.jpg
diff --git a/setup-and-run-mobile-app/system-settings-battery-optimization-lastmiler-turned-off-1.jpg b/setup-and-run-mobile-app/raw-screenshots/system-settings-battery-optimization-lastmiler-turned-off-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-battery-optimization-lastmiler-turned-off-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-battery-optimization-lastmiler-turned-off-1.jpg
diff --git a/setup-and-run-mobile-app/system-settings-lastmiler-page-auto-remove-permissions-turned-off-1.jpg b/setup-and-run-mobile-app/raw-screenshots/system-settings-lastmiler-page-auto-remove-permissions-turned-off-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-lastmiler-page-auto-remove-permissions-turned-off-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-lastmiler-page-auto-remove-permissions-turned-off-1.jpg
diff --git a/setup-and-run-mobile-app/system-settings-location-permissions-1.jpg b/setup-and-run-mobile-app/raw-screenshots/system-settings-location-permissions-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-location-permissions-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-location-permissions-1.jpg
diff --git a/setup-and-run-mobile-app/system-settings-notifications.png b/setup-and-run-mobile-app/raw-screenshots/system-settings-notifications.png
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-notifications.png
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-notifications.png
diff --git a/setup-and-run-mobile-app/system-settings-power-settings-turned-off-1.jpg b/setup-and-run-mobile-app/raw-screenshots/system-settings-power-settings-turned-off-1.jpg
similarity index 100%
rename from setup-and-run-mobile-app/system-settings-power-settings-turned-off-1.jpg
rename to setup-and-run-mobile-app/raw-screenshots/system-settings-power-settings-turned-off-1.jpg
diff --git a/setup-and-run-mobile-app/tracking-1.png b/setup-and-run-mobile-app/tracking-1.png
new file mode 100644
index 0000000..6b6494e
Binary files /dev/null and b/setup-and-run-mobile-app/tracking-1.png differ
diff --git a/text.md b/wiki/setup-and-run-mobile-app.md
similarity index 83%
rename from text.md
rename to wiki/setup-and-run-mobile-app.md
index 3586547..bdbf1dc 100644
--- a/text.md
+++ b/wiki/setup-and-run-mobile-app.md
@@ -19,11 +19,13 @@
 5. Tap "Install"
 6. Wait until the installation is ready and go back to your device's main screen
 
+![Installing Lastmiler App From Play Store](https://gitea.redburst.com/lastmiler-knowledge-base/Manager/raw/branch/main/setup-and-run-mobile-app/group-app-instalation-1.png)
+
 ## When starting the app
 
 **It is very important to follow all the steps in this setup document for optimal use of the Lastmiler App!**
 
-- Tap Allow when the app is asking about Notifications at first start up.
+- Tap Allow if the app is asking about Notifications at first start up.
 - Continue with the next steps in this document and complete them all.
 
 ## Using the App for the first time
@@ -33,6 +35,8 @@
 3. Tap "Tracking" in the main menu
 4. Tap "Start Tracking" in the tracking menu
 
+![Starting Lastmiler App For The First Time](https://gitea.redburst.com/lastmiler-knowledge-base/Manager/raw/branch/main/setup-and-run-mobile-app/group-app-first-startup-1.png)
+
 ## Configuration of the App 1/4
 
 When starting tracking for the first time, a few
@@ -42,13 +46,16 @@ questions are automatically asked:
 2. At: "Allow Lastmiler to access this device's location?" answer: "While using the app"
 3. At: "Allow Lastmiler to access your physical activity?" answer: "Allow"
 
+![Configuring Lastmiler App Step 1](https://gitea.redburst.com/lastmiler-knowledge-base/Manager/raw/branch/main/setup-and-run-mobile-app/group-app-configuration-1-1.png)
+
 ## Configuration of the App 2/4
 
 1. At: "Allow Lastmiler to access to this device's location in the background?" answer: "Change to Allow all the time"
 2. At settings of "Location permission" set: "Allow all the time"
 3. Go back out of the settings
 4. Go out of the App to your device's main screen
-5. Hold down the Lastmiler App icon two seconds and select: "App info" in the menu
+
+![Configuring Lastmiler App Step 2](https://gitea.redburst.com/lastmiler-knowledge-base/Manager/raw/branch/main/setup-and-run-mobile-app/group-app-configuration-2-1.png)
 
 ## Configuration of the App 3/4