diff --git a/Dockerfile b/Dockerfile
index f23beac..a4797ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,6 +33,7 @@ RUN apt-get clean
 COPY ./src/ /app/src/
 COPY ./config/ /app/config/
 COPY ./storage/ /app/storage/
+COPY ./public/ /app/storage/
 COPY ./composer.json /app/
 COPY ./index.php /app/
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 90496dc..6e775d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,8 +7,9 @@ services:
             - ./.env
         volumes:
             - ./src/:/app/src/
-            - ./storage/:/app/storage/
             - ./config/:/app/config/
+            - ./storage/:/app/storage/
+            - ./public/:/app/public/
         ports:
             - '8080:8080'
         logging:
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
new file mode 100644
index 0000000..c554148
--- /dev/null
+++ b/public/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..5c7db39
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/public/images/android-icon-144x144.png b/public/images/android-icon-144x144.png
new file mode 100644
index 0000000..7f654bb
Binary files /dev/null and b/public/images/android-icon-144x144.png differ
diff --git a/public/images/android-icon-192x192.png b/public/images/android-icon-192x192.png
new file mode 100644
index 0000000..d41d0c3
Binary files /dev/null and b/public/images/android-icon-192x192.png differ
diff --git a/public/images/android-icon-36x36.png b/public/images/android-icon-36x36.png
new file mode 100644
index 0000000..5fa01ba
Binary files /dev/null and b/public/images/android-icon-36x36.png differ
diff --git a/public/images/android-icon-48x48.png b/public/images/android-icon-48x48.png
new file mode 100644
index 0000000..d929660
Binary files /dev/null and b/public/images/android-icon-48x48.png differ
diff --git a/public/images/android-icon-72x72.png b/public/images/android-icon-72x72.png
new file mode 100644
index 0000000..df968cb
Binary files /dev/null and b/public/images/android-icon-72x72.png differ
diff --git a/public/images/android-icon-96x96.png b/public/images/android-icon-96x96.png
new file mode 100644
index 0000000..db0e320
Binary files /dev/null and b/public/images/android-icon-96x96.png differ
diff --git a/public/images/apple-icon-114x114.png b/public/images/apple-icon-114x114.png
new file mode 100644
index 0000000..eff4329
Binary files /dev/null and b/public/images/apple-icon-114x114.png differ
diff --git a/public/images/apple-icon-120x120.png b/public/images/apple-icon-120x120.png
new file mode 100644
index 0000000..e9597ff
Binary files /dev/null and b/public/images/apple-icon-120x120.png differ
diff --git a/public/images/apple-icon-144x144.png b/public/images/apple-icon-144x144.png
new file mode 100644
index 0000000..7f654bb
Binary files /dev/null and b/public/images/apple-icon-144x144.png differ
diff --git a/public/images/apple-icon-152x152.png b/public/images/apple-icon-152x152.png
new file mode 100644
index 0000000..80fce6e
Binary files /dev/null and b/public/images/apple-icon-152x152.png differ
diff --git a/public/images/apple-icon-180x180.png b/public/images/apple-icon-180x180.png
new file mode 100644
index 0000000..a601f65
Binary files /dev/null and b/public/images/apple-icon-180x180.png differ
diff --git a/public/images/apple-icon-57x57.png b/public/images/apple-icon-57x57.png
new file mode 100644
index 0000000..812ddc4
Binary files /dev/null and b/public/images/apple-icon-57x57.png differ
diff --git a/public/images/apple-icon-60x60.png b/public/images/apple-icon-60x60.png
new file mode 100644
index 0000000..9163096
Binary files /dev/null and b/public/images/apple-icon-60x60.png differ
diff --git a/public/images/apple-icon-72x72.png b/public/images/apple-icon-72x72.png
new file mode 100644
index 0000000..df968cb
Binary files /dev/null and b/public/images/apple-icon-72x72.png differ
diff --git a/public/images/apple-icon-76x76.png b/public/images/apple-icon-76x76.png
new file mode 100644
index 0000000..9acd2b1
Binary files /dev/null and b/public/images/apple-icon-76x76.png differ
diff --git a/public/images/apple-icon-precomposed.png b/public/images/apple-icon-precomposed.png
new file mode 100644
index 0000000..4d96bb6
Binary files /dev/null and b/public/images/apple-icon-precomposed.png differ
diff --git a/public/images/apple-icon.png b/public/images/apple-icon.png
new file mode 100644
index 0000000..4d96bb6
Binary files /dev/null and b/public/images/apple-icon.png differ
diff --git a/public/images/favicon-16x16.png b/public/images/favicon-16x16.png
new file mode 100644
index 0000000..2a9b2f4
Binary files /dev/null and b/public/images/favicon-16x16.png differ
diff --git a/public/images/favicon-32x32.png b/public/images/favicon-32x32.png
new file mode 100644
index 0000000..63ffb39
Binary files /dev/null and b/public/images/favicon-32x32.png differ
diff --git a/public/images/favicon-96x96.png b/public/images/favicon-96x96.png
new file mode 100644
index 0000000..d26207a
Binary files /dev/null and b/public/images/favicon-96x96.png differ
diff --git a/public/images/icon-512.png b/public/images/icon-512.png
new file mode 100644
index 0000000..390a13d
Binary files /dev/null and b/public/images/icon-512.png differ
diff --git a/public/images/ms-icon-144x144.png b/public/images/ms-icon-144x144.png
new file mode 100644
index 0000000..54ae9a0
Binary files /dev/null and b/public/images/ms-icon-144x144.png differ
diff --git a/public/images/ms-icon-150x150.png b/public/images/ms-icon-150x150.png
new file mode 100644
index 0000000..de74006
Binary files /dev/null and b/public/images/ms-icon-150x150.png differ
diff --git a/public/images/ms-icon-310x310.png b/public/images/ms-icon-310x310.png
new file mode 100644
index 0000000..3bbc38f
Binary files /dev/null and b/public/images/ms-icon-310x310.png differ
diff --git a/public/images/ms-icon-70x70.png b/public/images/ms-icon-70x70.png
new file mode 100644
index 0000000..b862757
Binary files /dev/null and b/public/images/ms-icon-70x70.png differ
diff --git a/public/manifest.json b/public/manifest.json
new file mode 100644
index 0000000..e40d740
--- /dev/null
+++ b/public/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "IPList",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/src/App/Template/IndexTemplate.php b/src/App/Template/IndexTemplate.php
index e26ce11..e32c5e4 100644
--- a/src/App/Template/IndexTemplate.php
+++ b/src/App/Template/IndexTemplate.php
@@ -8,7 +8,28 @@ use OpenCCK\App\Controller\TextController;
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>IPList</title>
+
+    <title>IP Address Collection Service</title>
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/images/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/images/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/images/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/images/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/images/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/images/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/images/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/images/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="512x512"  href="/images/icon-512.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/images/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/images/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/images/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/images/favicon-16x16.png">
+    <link rel="manifest" href="/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/images/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
+
     <style>
         /* MVP.css v1.15 - https://github.com/andybrewer/mvp */
         :root {
diff --git a/src/Infrastructure/API/Server.php b/src/Infrastructure/API/Server.php
index 042e1a1..1f081d1 100644
--- a/src/Infrastructure/API/Server.php
+++ b/src/Infrastructure/API/Server.php
@@ -11,7 +11,9 @@ use Amp\Http\Server\Driver\SocketClientFactory;
 use Amp\Http\Server\ErrorHandler;
 use Amp\Http\Server\HttpServer;
 use Amp\Http\Server\HttpServerStatus;
+use Amp\Http\Server\Router;
 use Amp\Http\Server\SocketHttpServer;
+use Amp\Http\Server\StaticContent\DocumentRoot;
 use Amp\Socket\BindContext;
 use Amp\Sync\LocalSemaphore;
 use Amp\Socket;
@@ -95,7 +97,11 @@ final class Server implements AppModuleInterface {
             //    new Socket\InternetAddress('[::]', $_ENV['HTTP_PORT'] ?? 8080),
             //    $this->bindContext
             //);
-            $this->httpServer->start(HTTPHandler::getInstance($this->logger)->getHandler(), $this->errorHandler);
+            $router = new Router($this->httpServer, $this->logger, $this->errorHandler);
+            $router->addRoute('GET', '/', HTTPHandler::getInstance($this->logger)->getHandler());
+            $router->setFallback(new DocumentRoot($this->httpServer, $this->errorHandler, PATH_ROOT . '/public'));
+
+            $this->httpServer->start($router, $this->errorHandler);
         } catch (Socket\SocketException $e) {
             $this->logger->warning($e->getMessage());
         } catch (Throwable $e) {