diff --git a/src/main/java/ua/com/dxrkness/controller/S3FileHandler.java b/src/main/java/ua/com/dxrkness/controller/S3FileHandler.java
index 246e8e7..aaa9e6b 100644
--- a/src/main/java/ua/com/dxrkness/controller/S3FileHandler.java
+++ b/src/main/java/ua/com/dxrkness/controller/S3FileHandler.java
@@ -64,7 +64,7 @@ public class S3FileHandler {
                                 .created(URI.create("/files"))
                                 .body(new DirectoryPath(
                                         path.resolve(
-                                                file.getSubmittedFileName()
+                                                file.getSubmittedFileName().replaceAll("\s", "_")
                                         )
                                 ));
                     } catch (IOException e) {
diff --git a/src/main/java/ua/com/dxrkness/controller/S3FileHandlerConfig.java b/src/main/java/ua/com/dxrkness/controller/S3FileHandlerConfig.java
index 55f8b80..1be5575 100644
--- a/src/main/java/ua/com/dxrkness/controller/S3FileHandlerConfig.java
+++ b/src/main/java/ua/com/dxrkness/controller/S3FileHandlerConfig.java
@@ -3,6 +3,7 @@ package ua.com.dxrkness.controller;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.function.RouterFunction;
 import org.springframework.web.servlet.function.RouterFunctions;
@@ -35,4 +36,10 @@ public class S3FileHandlerConfig implements WebMvcConfigurer {
                 .allowedHeaders("*")
                 .allowedOriginPatterns("*");
     }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler("/public/**")
+                .addResourceLocations("classpath:/static/");
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/ua/com/dxrkness/service/S3Service.java b/src/main/java/ua/com/dxrkness/service/S3Service.java
index 30c216b..de8fe1a 100644
--- a/src/main/java/ua/com/dxrkness/service/S3Service.java
+++ b/src/main/java/ua/com/dxrkness/service/S3Service.java
@@ -102,7 +102,7 @@ public class S3Service {
         client.putObject(b -> b
                         .bucket(bucketName)
                         .key(destinationPath
-                                .resolve(file.getSubmittedFileName())
+                                .resolve(file.getSubmittedFileName().replace("\s", "_"))
                                 .toString()),
                 RequestBody.fromInputStream(file.getInputStream(), file.getSize()));
     }
diff --git a/static/common.html b/src/main/resources/static/common.html
similarity index 97%
rename from static/common.html
rename to src/main/resources/static/common.html
index ec95df2..59f2dca 100644
--- a/static/common.html
+++ b/src/main/resources/static/common.html
@@ -34,8 +34,14 @@
   <button onclick="navigateToPath()">Go to Path</button>
 </div>
 
+<div>
+  <h3>Just a meme from S3 bucket</h3>
+  <img width="40%"
+    src="https://student-test-bucket-orlovos-2025.s3.eu-central-1.amazonaws.com/meme.jpg">
+</div>
+
 <script>
-  const baseUrl = 'http://localhost:8080';
+  const baseUrl = 'http://18.199.97.136:8080';
   let currentPath = '';
 
   document.addEventListener('DOMContentLoaded', function() {