diff --git a/projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html b/projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
index c8724501..7dbe8b02 100644
--- a/projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
+++ b/projects/ucap-webmessenger-app/src/app/pages/template/components/template.page.component.html
@@ -41,10 +41,10 @@
     </div>
     <div>
       <div>
-        file
+        attach-file
       </div>
       <div>
-        <ucap-chat-message-box-file></ucap-chat-message-box-file>
+        <ucap-chat-message-box-attach-file></ucap-chat-message-box-attach-file>
       </div>
     </div>
     <div>
@@ -55,6 +55,14 @@
         <ucap-chat-message-box-image></ucap-chat-message-box-image>
       </div>
     </div>
+    <div>
+      <div>
+        video
+      </div>
+      <div>
+        <ucap-chat-message-box-video></ucap-chat-message-box-video>
+      </div>
+    </div>
     <div>
       <div>
         information
@@ -125,14 +133,6 @@
         <ucap-chat-message-box-translation></ucap-chat-message-box-translation>
       </div>
     </div>
-    <div>
-      <div>
-        video
-      </div>
-      <div>
-        <ucap-chat-message-box-video></ucap-chat-message-box-video>
-      </div>
-    </div>
     <div>
       <div>
         video-conference
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
index 02c85622..acc4d56b 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.html
@@ -18,7 +18,8 @@
         </li>
       </ul>
     </div>
-    <ng-container [ngSwitch]="message.type">
+
+    <ng-container class="bubble" [ngSwitch]="message.type">
       <ucap-chat-message-box-information *ngSwitchCase="EventType.Join" [message]="message">
       </ucap-chat-message-box-information>
       <ucap-chat-message-box-information *ngSwitchCase="EventType.Exit" [message]="message">
@@ -45,10 +46,8 @@
         video-conference
         <ucap-chat-message-box-video-conference></ucap-chat-message-box-video-conference>
 
-        <div class="bubble">
-          <div class="message">
-            {{ message.sentMessage }}
-          </div>
+        <div class="message">
+          {{ message.sentMessage }}
         </div>
       </div>
     </ng-container>