diff --git a/angular.json b/angular.json
index 0a6f978..e9efa56 100644
--- a/angular.json
+++ b/angular.json
@@ -42,12 +42,12 @@
                 {
                   "type": "initial",
                   "maximumWarning": "500kB",
-                  "maximumError": "1MB"
+                  "maximumError": "100MB"
                 },
                 {
                   "type": "anyComponentStyle",
                   "maximumWarning": "4kB",
-                  "maximumError": "8kB"
+                  "maximumError": "100MB"
                 }
               ],
               "outputHashing": "all",
diff --git a/public/i18n/en.json b/public/i18n/en.json
index 7c20186..67c21a5 100644
--- a/public/i18n/en.json
+++ b/public/i18n/en.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0 Beta 4 (April 11, 2026)",
+  "version": "3.0 Beta 5 (April 13, 2026)",
   "ok": "Ok",
   "back": "Back",
   "aChatProgram": "A messaging platform that you can trust.",
@@ -104,11 +104,15 @@
     "changeLogDialog": {
       "label": "Chatenium has been updated",
       "changeLog": {
-        "1": "Added support for text channels inside networks",
-        "2": "Bug fixes in message box"
+        "1": "Started implementing Chatenium Pictures",
+        "2": "Made small changes to the UI",
+        "3": "Minor bug fixes in message box"
       }
     },
     "chatnav": {
+      "pictureList": {
+        "myPictures": "My pictures"
+      },
       "dmList": {
         "newChat": "Start new chat",
         "messageBox": {
@@ -121,6 +125,11 @@
         "newNetwork": "Start new network"
       }
     },
+    "pictures": {
+      "albumList": {
+        "noAlbum": "This user has no albums published"
+      }
+    },
     "elements": {
       "messageBox": {
         "editMessageLabel": "Editing message: ",
diff --git a/src/app/chat/dm/dm.ts b/src/app/chat/dm/dm.ts
index 37e348e..3dc47af 100644
--- a/src/app/chat/dm/dm.ts
+++ b/src/app/chat/dm/dm.ts
@@ -61,8 +61,6 @@ export class Dm implements OnInit {
           }
         }
 
-        this.store.messageBox.editingMessage.set(null)
-        this.store.messageBox.message.set("")
         return
       }
 
diff --git a/src/app/chat/elements/message-box/message-box.ts b/src/app/chat/elements/message-box/message-box.ts
index 3715264..cc137a5 100644
--- a/src/app/chat/elements/message-box/message-box.ts
+++ b/src/app/chat/elements/message-box/message-box.ts
@@ -104,6 +104,7 @@ export class MessageBox {
     this.viewModel().message.set("")
     this.viewModel().files.set([])
     this.viewModel().dialogOpen.set(false)
+    this.viewModel().editingMessage.set(null)
   }
 
   handleEnterKeydown(e: any) {
diff --git a/src/app/chat/elements/oimg/oimg.scss b/src/app/chat/elements/oimg/oimg.scss
index e69de29..1ab7bd3 100644
--- a/src/app/chat/elements/oimg/oimg.scss
+++ b/src/app/chat/elements/oimg/oimg.scss
@@ -0,0 +1,3 @@
+img {
+  display: block;
+}
diff --git a/src/app/chat/network-list/network-list.html b/src/app/chat/network-list/network-list.html
index 9ba0f74..306d718 100644
--- a/src/app/chat/network-list/network-list.html
+++ b/src/app/chat/network-list/network-list.html
@@ -4,7 +4,7 @@
 
 @for (network of serviceManager.networks(); track network.networkId) {
   <button [class.enlarge]="breakpoint() == 'mobile'" tuiButton
-          [appearance]="router.url == '/chat/network/' + network.networkId ? 'primary' : 'flat'"
+          [appearance]="router.url.startsWith('/chat/network/' + network.networkId) ? 'primary' : 'flat'"
           [routerLink]="'/chat/network/' + network.networkId">
     <oimg [src]="network.picture" height="35px" width="35px" [radius]="10"></oimg>
     <div class="info">
diff --git a/src/app/chat/network/channel/text/text.ts b/src/app/chat/network/channel/text/text.ts
index 3122b38..7ce7a81 100644
--- a/src/app/chat/network/channel/text/text.ts
+++ b/src/app/chat/network/channel/text/text.ts
@@ -120,8 +120,6 @@ export class Text {
         }
       })
     }
-
-    this.store.messageBox.message.set("")
   }
 
   async deleteMessage(messageId: string) {
diff --git a/src/app/chat/network/network.html b/src/app/chat/network/network.html
index a914bb4..87486b0 100644
--- a/src/app/chat/network/network.html
+++ b/src/app/chat/network/network.html
@@ -20,7 +20,7 @@
 
             <div tuiGroup orientation="vertical" style="width: 100%">
               @for (channel of category.channels; track channel) {
-                <button tuiButton class="channel" appearance="secondary" [disabled]="channel.type != 'message'" [routerLink]="'/chat/network/'+store.networkData().networkId+'/'+category.categoryId+'/'+channel.channelId">
+                <button tuiButton class="channel" [appearance]="router.url.endsWith(channel.channelId) ? 'primary' : 'secondary'" [disabled]="channel.type != 'message'" [routerLink]="'/chat/network/'+store.networkData().networkId+'/'+category.categoryId+'/'+channel.channelId">
                   @switch (channel.type) {
                     @case ("message") {
                       <tui-icon icon="@tui.hash"></tui-icon>
diff --git a/src/app/chat/network/network.scss b/src/app/chat/network/network.scss
index bbbe07f..84b18f1 100644
--- a/src/app/chat/network/network.scss
+++ b/src/app/chat/network/network.scss
@@ -14,7 +14,7 @@
     grid-template-columns: 1fr 300px;
 
     #router {
-      background: var(--tui-background-neutral-1-pressed);
+      background: var(--tui-background-neutral-1);
     }
 
     main {
diff --git a/src/app/chat/network/network.ts b/src/app/chat/network/network.ts
index ffcfc50..d3aa406 100644
--- a/src/app/chat/network/network.ts
+++ b/src/app/chat/network/network.ts
@@ -1,5 +1,5 @@
 import {Component, inject, OnInit, signal} from '@angular/core';
-import {ActivatedRoute, RouterLink, RouterOutlet} from '@angular/router';
+import {ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
 import {Chat} from '@chatenium/chatenium-sdk/domain/chatService.schema';
 import {Message} from '@chatenium/chatenium-sdk/domain/dmService.schema';
 import {MessageBoxViewModel} from '../elements/message-box/message-box-viewmodel';
@@ -31,6 +31,7 @@ export class Network implements OnInit {
   route = inject(ActivatedRoute)
   indexedDb = inject(IndexedDB)
   breakpoint = inject(TUI_BREAKPOINT)
+  router = inject(Router)
 
   routerOutletActive = signal(false)
 
diff --git a/src/app/chat/picture-list/picture-list.html b/src/app/chat/picture-list/picture-list.html
index fa8619d..ddb6bf5 100644
--- a/src/app/chat/picture-list/picture-list.html
+++ b/src/app/chat/picture-list/picture-list.html
@@ -1,5 +1,5 @@
-<button disabled tuiButton appearance="secondary" iconStart="@tui.mail-plus">
-  {{"chat.chatnav.dmList.newChat"|translate}}
+<button (click)="router.navigate(['/chat/picture/'+serviceManager.currentSession()!.userData.userid])" tuiButton [appearance]="router.url == '/chat/picture/' + serviceManager.currentSession()!.userData.userid ? 'primary' : 'secondary'" iconStart="@tui.user">
+  {{"chat.chatnav.pictureList.myPictures"|translate}}
 </button>
 
 @for (chat of serviceManager.chats(); track chat.chatid) {
diff --git a/src/app/chat/picture/see/see.html b/src/app/chat/picture/see/see.html
index 14346a4..40a1b83 100644
--- a/src/app/chat/picture/see/see.html
+++ b/src/app/chat/picture/see/see.html
@@ -1,10 +1,14 @@
+<ng-template [(tuiDialog)]="viewerOpen">
+  <oimg [src]="viewedPicture!.path" height="100%" width="100%" [radius]="0"></oimg>
+</ng-template>
+
 <main>
   @defer (when store) {
     <navbar backButtonDest="/chat">
       <div class="data">
         <oimg [src]="store.uploaderData().pfp" height="50px" width="50px" [radius]="15"></oimg>
         <div class="uploader-data">
-          @if (store.uploaderData().displayName == "") {
+          @if (!store.uploaderData().displayName) {
             <span class="main-name">{{'@'+store.uploaderData().username}}</span>
           } @else {
             <span class="main-name">{{store.uploaderData().displayName}}</span>
@@ -18,17 +22,39 @@
     </navbar>
 
     <main>
-      @for (album of store.albums(); track album) {
-        <div class="album">
-          <masonry [maxColSize]="3" style="height: 300px; pointer-events: none;">
-            @for (file of album.images; track file) {
-              <img [src]="file.path+'_thumbnail.png'" style="filter: blur(5px)"/>
-            }
-          </masonry>
-          <div class="album-name">
-            <h2>{{album.name}}</h2>
-          </div>
+      @if (openedAlbum) {
+        <div style="display: flex; align-items: center; gap: 10px">
+          <button tuiButton appearance="flat" iconStart="@tui.chevron-left" (click)="exitAlbum()"></button>
+          <h1 style="padding: 0; margin: 0">{{openedAlbum.name}}</h1>
         </div>
+
+        <div id="pictureList">
+          @for (picture of openedAlbum.images; track picture) {
+            <oimg (click)="viewPicture(picture)" [src]="picture.path" height="200px" width="200px" [radius]="25" objectFit="none"></oimg>
+          }
+        </div>
+      } @else {
+        @if (store.albums().length == 0) {
+          <tui-block-status style="height: 300px">
+            <tui-icon icon="@tui.frown" tuiSlot="top" style="font-size: 150px"></tui-icon>
+            <h4>{{"chat.pictures.albumList.noAlbum"|translate}}</h4>
+          </tui-block-status>
+        } @else {
+          <div id="albumList">
+            @for (album of store.albums(); track album) {
+              <div class="album" (click)="enterAlbum(album.albumId)">
+                <masonry [maxColSize]="3" style="height: 300px; pointer-events: none;">
+                  @for (file of album.images; track file) {
+                    <img [src]="file.path+'_thumbnail.png'" style="filter: blur(5px)"/>
+                  }
+                </masonry>
+                <div class="album-name">
+                  <h2>{{album.name}}</h2>
+                </div>
+              </div>
+            }
+          </div>
+        }
       }
     </main>
   }
diff --git a/src/app/chat/picture/see/see.scss b/src/app/chat/picture/see/see.scss
index 2fe083d..df1bf39 100644
--- a/src/app/chat/picture/see/see.scss
+++ b/src/app/chat/picture/see/see.scss
@@ -31,7 +31,7 @@ main {
     }
   }
 
-  main {
+  #albumList {
     display: flex;
     gap: 10px;
     flex-wrap: wrap;
@@ -45,6 +45,7 @@ main {
       border-radius: 30px;
       overflow: hidden;
       position: relative;
+      cursor: pointer;
 
       .album-name {
         position: absolute;
@@ -66,4 +67,19 @@ main {
       }
     }
   }
+
+  #pictureList {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px;
+    align-content: flex-start;
+    overflow-y: scroll;
+
+    oimg {
+      background: var(--tui-background-base-alt);
+      height: 200px;
+      border-radius: 25px;
+      cursor: pointer;
+    }
+  }
 }
diff --git a/src/app/chat/picture/see/see.ts b/src/app/chat/picture/see/see.ts
index 2dd663c..bdf4b89 100644
--- a/src/app/chat/picture/see/see.ts
+++ b/src/app/chat/picture/see/see.ts
@@ -1,12 +1,17 @@
 import {Component, inject, signal} from '@angular/core';
 import {DmStorage, PictureStorage, ServiceManager} from '../../../service-manager';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {IndexedDB} from '../../../storage/indexed-db';
-import {TUI_BREAKPOINT, TuiButton, TuiIcon} from '@taiga-ui/core';
+import {TUI_BREAKPOINT, TuiButton, TuiDialog, TuiIcon} from '@taiga-ui/core';
 import {PictureService} from '@chatenium/chatenium-sdk/services/pictureService';
 import {Navbar} from '../../elements/navbar/navbar';
 import {Oimg} from '../../elements/oimg/oimg';
 import {Masonry} from '../../elements/masonry/masonry';
+import {Album, Image} from '@chatenium/chatenium-sdk/domain/pictureService.schema';
+import {pictureHandlers} from '@chatenium/chatenium-sdk/mocks/handlers/picture.http';
+import {TuiBlockStatusComponent} from '@taiga-ui/layout';
+import {TranslatePipe} from '@ngx-translate/core';
+import {TuiBadgedContentDirective} from '@taiga-ui/kit';
 
 @Component({
   selector: 'app-see',
@@ -15,7 +20,11 @@ import {Masonry} from '../../elements/masonry/masonry';
     Oimg,
     TuiButton,
     TuiIcon,
-    Masonry
+    Masonry,
+    TuiDialog,
+    TuiBlockStatusComponent,
+    TranslatePipe,
+    TuiBadgedContentDirective
   ],
   templateUrl: './see.html',
   styleUrl: './see.scss',
@@ -25,13 +34,50 @@ export class See {
   route = inject(ActivatedRoute)
   indexedDb = inject(IndexedDB)
   breakpoint = inject(TUI_BREAKPOINT)
+  router = inject(Router)
 
   uploaderId = ""
+  openedAlbum: Album | null = null
+
+  viewedPicture: Image | null = null
+  get viewerOpen() {
+    return this.viewedPicture != null
+  }
+  set viewerOpen(_: any) {
+    this.viewedPicture = null
+    this.router.navigate([], {
+      queryParams: { pictureId: null },
+      queryParamsHandling: "merge"
+    })
+  }
 
   get store(): PictureStorage {
     return this.serviceManager.pictureServices()[this.uploaderId]
   }
 
+  enterAlbum(albumId: string) {
+    this.router.navigate([], {
+      queryParams: { albumId: albumId },
+      queryParamsHandling: "merge"
+    })
+  }
+
+  exitAlbum() {
+    this.openedAlbum = null
+    this.router.navigate([], {
+      queryParams: { albumId: null },
+      queryParamsHandling: "merge"
+    })
+  }
+
+  viewPicture(picture: Image) {
+    this.viewedPicture = picture
+    this.router.navigate([], {
+      queryParams: { pictureId: picture.imageId },
+      queryParamsHandling: "merge"
+    })
+  }
+
   ngOnInit() {
     this.route.params.subscribe(async params => {
       const uploaderId = params['uploaderId'];
@@ -60,7 +106,28 @@ export class See {
             service: newService,
           } as PictureStorage
         }));
+
+        // Show album
+        this.route.queryParams.subscribe(params => {
+          const albumId = params['albumId'];
+          if (albumId) {
+            const album = uploaderInfo.pictures.find(a => a.albumId === albumId)
+            if (album) {
+              this.openedAlbum = album
+
+              const pictureId = params['pictureId'];
+              if (pictureId) {
+                const picture = album.images.find(img => img.imageId === pictureId)
+                if (picture) {
+                  this.viewedPicture = picture
+                }
+              }
+            }
+          }
+        })
       }
     });
   }
+
+  protected readonly pictureHandlers = pictureHandlers;
 }
diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
index cd19820..a9fa792 100644
--- a/src/environments/environment.development.ts
+++ b/src/environments/environment.development.ts
@@ -1,5 +1,5 @@
 export const environment = {
-  version: "3.0-beta4",
+  version: "3.0-beta5",
   api_url: "http://localhost:3000",
   cdn_url: "http://localhost:4000",
   ws_url: "ws://localhost:3000",
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 00ce2f0..e69ecbf 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,5 +1,5 @@
 export const environment = {
-  version: "3.0-beta4",
+  version: "3.0-beta5",
   api_url: "https://api.chatenium.hu",
   cdn_url: "https://cdn.chatenium.hu",
   ws_url: "wss://api.chatenium.hu",