diff --git a/ModelCabinet.Server/Migrations/20250317212011_modifiedTagData.Designer.cs b/ModelCabinet.Server/Migrations/20250317212011_modifiedTagData.Designer.cs
new file mode 100644
index 0000000..c26ade2
--- /dev/null
+++ b/ModelCabinet.Server/Migrations/20250317212011_modifiedTagData.Designer.cs
@@ -0,0 +1,667 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using ModelCabinet.Server.Data;
+
+#nullable disable
+
+namespace ModelCabinet.Server.Migrations
+{
+    [DbContext(typeof(ModelCabinetContext))]
+    [Migration("20250317212011_modifiedTagData")]
+    partial class modifiedTagData
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.13")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex")
+                        .HasFilter("[NormalizedName] IS NOT NULL");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(128)
+                        .HasColumnType("nvarchar(128)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.ApplicationUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("AvatarUrl")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Biography")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DateJoined")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DisplayName")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("EmailNotificationsEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("GithubUsername")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("IsProfilePublic")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTime>("LastActive")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Location")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetimeoffset");
+
+                    b.Property<bool>("NewMessageNotificationsEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("PreferredLanguage")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("ProjectUpdatesEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TimeZone")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("TwitterHandle")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("nvarchar(256)");
+
+                    b.Property<string>("Website")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex")
+                        .HasFilter("[NormalizedUserName] IS NOT NULL");
+
+                    b.ToTable("AspNetUsers", (string)null);
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Asset", b =>
+                {
+                    b.Property<int>("AssetId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("AssetId"));
+
+                    b.Property<DateTime>("DateCreation")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("DateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("ProjectId")
+                        .HasColumnType("int");
+
+                    b.HasKey("AssetId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.ToTable("Asset");
+
+                    b.HasData(
+                        new
+                        {
+                            AssetId = 1,
+                            DateCreation = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2109),
+                            DateUpdated = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2164),
+                            FileSize = 446684L,
+                            Name = "Test Asset",
+                            Path = "Assets\\TestProject\\HelloWorld.stl",
+                            ProjectId = 1
+                        },
+                        new
+                        {
+                            AssetId = 2,
+                            DateCreation = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2169),
+                            DateUpdated = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2171),
+                            FileSize = 11285384L,
+                            Name = "Benchy",
+                            Path = "Assets\\TestProject\\3DBenchy.stl",
+                            ProjectId = 1
+                        });
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.AssetTag", b =>
+                {
+                    b.Property<int>("AssetId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TagId")
+                        .HasColumnType("int");
+
+                    b.HasKey("AssetId", "TagId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("AssetTag");
+
+                    b.HasData(
+                        new
+                        {
+                            AssetId = 2,
+                            TagId = 1
+                        },
+                        new
+                        {
+                            AssetId = 2,
+                            TagId = 5
+                        },
+                        new
+                        {
+                            AssetId = 2,
+                            TagId = 2
+                        },
+                        new
+                        {
+                            AssetId = 1,
+                            TagId = 4
+                        },
+                        new
+                        {
+                            AssetId = 1,
+                            TagId = 6
+                        });
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Project", b =>
+                {
+                    b.Property<int>("ProjectId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ProjectId"));
+
+                    b.Property<string>("Author")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("CreationDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("ModifiedDate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ShortDescription")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Slug")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Version")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("ProjectId");
+
+                    b.HasIndex("Slug")
+                        .IsUnique();
+
+                    b.ToTable("Project");
+
+                    b.HasData(
+                        new
+                        {
+                            ProjectId = 1,
+                            Author = "Author",
+                            CreationDate = new DateTime(2024, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            Description = "Description",
+                            ModifiedDate = new DateTime(2024, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            Name = "Test Project",
+                            ShortDescription = "Desc",
+                            Slug = "nomen-est-omen",
+                            Version = "0.0.1"
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            Author = "Author",
+                            CreationDate = new DateTime(2024, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            Description = "Description",
+                            ModifiedDate = new DateTime(2024, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            Name = "Test Project Two",
+                            ShortDescription = "Desc",
+                            Slug = "nomen-est-bonum",
+                            Version = "0.0.1"
+                        });
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.ProjectTag", b =>
+                {
+                    b.Property<int>("ProjectId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TagId")
+                        .HasColumnType("int");
+
+                    b.HasKey("ProjectId", "TagId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("ProjectTag");
+
+                    b.HasData(
+                        new
+                        {
+                            ProjectId = 1,
+                            TagId = 3
+                        },
+                        new
+                        {
+                            ProjectId = 1,
+                            TagId = 4
+                        },
+                        new
+                        {
+                            ProjectId = 1,
+                            TagId = 5
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            TagId = 1
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            TagId = 2
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            TagId = 5
+                        });
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Tag", b =>
+                {
+                    b.Property<int>("TagId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("TagId"));
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasColumnType("char(6)");
+
+                    b.Property<string>("TagName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("TagId");
+
+                    b.HasIndex("TagName")
+                        .IsUnique();
+
+                    b.ToTable("Tag");
+
+                    b.HasData(
+                        new
+                        {
+                            TagId = 1,
+                            Color = "fae033",
+                            TagName = "Stress Test"
+                        },
+                        new
+                        {
+                            TagId = 2,
+                            Color = "df0000",
+                            TagName = "D&D"
+                        },
+                        new
+                        {
+                            TagId = 3,
+                            Color = "40E0D0",
+                            TagName = "Pathfinder"
+                        },
+                        new
+                        {
+                            TagId = 4,
+                            Color = "afafaf",
+                            TagName = "Low Detail"
+                        },
+                        new
+                        {
+                            TagId = 5,
+                            Color = "3f3f3f",
+                            TagName = "High Detail"
+                        },
+                        new
+                        {
+                            TagId = 6,
+                            Color = "23a300",
+                            TagName = "Video Game"
+                        });
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ModelCabinet.Server.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.ApplicationUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Asset", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.Project", null)
+                        .WithMany("Assets")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.AssetTag", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.Asset", "Asset")
+                        .WithMany("AssetTags")
+                        .HasForeignKey("AssetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ModelCabinet.Server.Models.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Asset");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.ProjectTag", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.Project", "Project")
+                        .WithMany("ProjectTags")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ModelCabinet.Server.Models.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Asset", b =>
+                {
+                    b.Navigation("AssetTags");
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Project", b =>
+                {
+                    b.Navigation("Assets");
+
+                    b.Navigation("ProjectTags");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/ModelCabinet.Server/Migrations/20250317212011_modifiedTagData.cs b/ModelCabinet.Server/Migrations/20250317212011_modifiedTagData.cs
new file mode 100644
index 0000000..57a4434
--- /dev/null
+++ b/ModelCabinet.Server/Migrations/20250317212011_modifiedTagData.cs
@@ -0,0 +1,174 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace ModelCabinet.Server.Migrations
+{
+    /// <inheritdoc />
+    public partial class modifiedTagData : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Tag",
+                columns: table => new
+                {
+                    TagId = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    TagName = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    Color = table.Column<string>(type: "char(6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Tag", x => x.TagId);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AssetTag",
+                columns: table => new
+                {
+                    AssetId = table.Column<int>(type: "int", nullable: false),
+                    TagId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AssetTag", x => new { x.AssetId, x.TagId });
+                    table.ForeignKey(
+                        name: "FK_AssetTag_Asset_AssetId",
+                        column: x => x.AssetId,
+                        principalTable: "Asset",
+                        principalColumn: "AssetId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_AssetTag_Tag_TagId",
+                        column: x => x.TagId,
+                        principalTable: "Tag",
+                        principalColumn: "TagId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ProjectTag",
+                columns: table => new
+                {
+                    ProjectId = table.Column<int>(type: "int", nullable: false),
+                    TagId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ProjectTag", x => new { x.ProjectId, x.TagId });
+                    table.ForeignKey(
+                        name: "FK_ProjectTag_Project_ProjectId",
+                        column: x => x.ProjectId,
+                        principalTable: "Project",
+                        principalColumn: "ProjectId",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_ProjectTag_Tag_TagId",
+                        column: x => x.TagId,
+                        principalTable: "Tag",
+                        principalColumn: "TagId",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.UpdateData(
+                table: "Asset",
+                keyColumn: "AssetId",
+                keyValue: 1,
+                columns: new[] { "DateCreation", "DateUpdated" },
+                values: new object[] { new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2109), new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2164) });
+
+            migrationBuilder.UpdateData(
+                table: "Asset",
+                keyColumn: "AssetId",
+                keyValue: 2,
+                columns: new[] { "DateCreation", "DateUpdated" },
+                values: new object[] { new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2169), new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2171) });
+
+            migrationBuilder.InsertData(
+                table: "Tag",
+                columns: new[] { "TagId", "Color", "TagName" },
+                values: new object[,]
+                {
+                    { 1, "fae033", "Stress Test" },
+                    { 2, "df0000", "D&D" },
+                    { 3, "40E0D0", "Pathfinder" },
+                    { 4, "afafaf", "Low Detail" },
+                    { 5, "3f3f3f", "High Detail" },
+                    { 6, "23a300", "Video Game" }
+                });
+
+            migrationBuilder.InsertData(
+                table: "AssetTag",
+                columns: new[] { "AssetId", "TagId" },
+                values: new object[,]
+                {
+                    { 1, 4 },
+                    { 1, 6 },
+                    { 2, 1 },
+                    { 2, 2 },
+                    { 2, 5 }
+                });
+
+            migrationBuilder.InsertData(
+                table: "ProjectTag",
+                columns: new[] { "ProjectId", "TagId" },
+                values: new object[,]
+                {
+                    { 1, 3 },
+                    { 1, 4 },
+                    { 1, 5 },
+                    { 2, 1 },
+                    { 2, 2 },
+                    { 2, 5 }
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AssetTag_TagId",
+                table: "AssetTag",
+                column: "TagId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ProjectTag_TagId",
+                table: "ProjectTag",
+                column: "TagId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Tag_TagName",
+                table: "Tag",
+                column: "TagName",
+                unique: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AssetTag");
+
+            migrationBuilder.DropTable(
+                name: "ProjectTag");
+
+            migrationBuilder.DropTable(
+                name: "Tag");
+
+            migrationBuilder.UpdateData(
+                table: "Asset",
+                keyColumn: "AssetId",
+                keyValue: 1,
+                columns: new[] { "DateCreation", "DateUpdated" },
+                values: new object[] { new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5697), new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5756) });
+
+            migrationBuilder.UpdateData(
+                table: "Asset",
+                keyColumn: "AssetId",
+                keyValue: 2,
+                columns: new[] { "DateCreation", "DateUpdated" },
+                values: new object[] { new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5760), new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5761) });
+        }
+    }
+}
diff --git a/ModelCabinet.Server/Migrations/ModelCabinetContextModelSnapshot.cs b/ModelCabinet.Server/Migrations/ModelCabinetContextModelSnapshot.cs
index e63828b..689cd9b 100644
--- a/ModelCabinet.Server/Migrations/ModelCabinetContextModelSnapshot.cs
+++ b/ModelCabinet.Server/Migrations/ModelCabinetContextModelSnapshot.cs
@@ -301,14 +301,14 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("ProjectId");
 
-                    b.ToTable("Asset", (string)null);
+                    b.ToTable("Asset");
 
                     b.HasData(
                         new
                         {
                             AssetId = 1,
-                            DateCreation = new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5697),
-                            DateUpdated = new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5756),
+                            DateCreation = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2109),
+                            DateUpdated = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2164),
                             FileSize = 446684L,
                             Name = "Test Asset",
                             Path = "Assets\\TestProject\\HelloWorld.stl",
@@ -317,8 +317,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         new
                         {
                             AssetId = 2,
-                            DateCreation = new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5760),
-                            DateUpdated = new DateTime(2025, 2, 25, 14, 39, 3, 727, DateTimeKind.Local).AddTicks(5761),
+                            DateCreation = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2169),
+                            DateUpdated = new DateTime(2025, 3, 17, 14, 20, 10, 930, DateTimeKind.Local).AddTicks(2171),
                             FileSize = 11285384L,
                             Name = "Benchy",
                             Path = "Assets\\TestProject\\3DBenchy.stl",
@@ -326,6 +326,48 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         });
                 });
 
+            modelBuilder.Entity("ModelCabinet.Server.Models.AssetTag", b =>
+                {
+                    b.Property<int>("AssetId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TagId")
+                        .HasColumnType("int");
+
+                    b.HasKey("AssetId", "TagId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("AssetTag");
+
+                    b.HasData(
+                        new
+                        {
+                            AssetId = 2,
+                            TagId = 1
+                        },
+                        new
+                        {
+                            AssetId = 2,
+                            TagId = 5
+                        },
+                        new
+                        {
+                            AssetId = 2,
+                            TagId = 2
+                        },
+                        new
+                        {
+                            AssetId = 1,
+                            TagId = 4
+                        },
+                        new
+                        {
+                            AssetId = 1,
+                            TagId = 6
+                        });
+                });
+
             modelBuilder.Entity("ModelCabinet.Server.Models.Project", b =>
                 {
                     b.Property<int>("ProjectId")
@@ -369,7 +411,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasIndex("Slug")
                         .IsUnique();
 
-                    b.ToTable("Project", (string)null);
+                    b.ToTable("Project");
 
                     b.HasData(
                         new
@@ -398,6 +440,115 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         });
                 });
 
+            modelBuilder.Entity("ModelCabinet.Server.Models.ProjectTag", b =>
+                {
+                    b.Property<int>("ProjectId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("TagId")
+                        .HasColumnType("int");
+
+                    b.HasKey("ProjectId", "TagId");
+
+                    b.HasIndex("TagId");
+
+                    b.ToTable("ProjectTag");
+
+                    b.HasData(
+                        new
+                        {
+                            ProjectId = 1,
+                            TagId = 3
+                        },
+                        new
+                        {
+                            ProjectId = 1,
+                            TagId = 4
+                        },
+                        new
+                        {
+                            ProjectId = 1,
+                            TagId = 5
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            TagId = 1
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            TagId = 2
+                        },
+                        new
+                        {
+                            ProjectId = 2,
+                            TagId = 5
+                        });
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Tag", b =>
+                {
+                    b.Property<int>("TagId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("TagId"));
+
+                    b.Property<string>("Color")
+                        .IsRequired()
+                        .HasColumnType("char(6)");
+
+                    b.Property<string>("TagName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(450)");
+
+                    b.HasKey("TagId");
+
+                    b.HasIndex("TagName")
+                        .IsUnique();
+
+                    b.ToTable("Tag");
+
+                    b.HasData(
+                        new
+                        {
+                            TagId = 1,
+                            Color = "fae033",
+                            TagName = "Stress Test"
+                        },
+                        new
+                        {
+                            TagId = 2,
+                            Color = "df0000",
+                            TagName = "D&D"
+                        },
+                        new
+                        {
+                            TagId = 3,
+                            Color = "40E0D0",
+                            TagName = "Pathfinder"
+                        },
+                        new
+                        {
+                            TagId = 4,
+                            Color = "afafaf",
+                            TagName = "Low Detail"
+                        },
+                        new
+                        {
+                            TagId = 5,
+                            Color = "3f3f3f",
+                            TagName = "High Detail"
+                        },
+                        new
+                        {
+                            TagId = 6,
+                            Color = "23a300",
+                            TagName = "Video Game"
+                        });
+                });
+
             modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
                 {
                     b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
@@ -458,9 +609,54 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired();
                 });
 
+            modelBuilder.Entity("ModelCabinet.Server.Models.AssetTag", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.Asset", "Asset")
+                        .WithMany("AssetTags")
+                        .HasForeignKey("AssetId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ModelCabinet.Server.Models.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Asset");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.ProjectTag", b =>
+                {
+                    b.HasOne("ModelCabinet.Server.Models.Project", "Project")
+                        .WithMany("ProjectTags")
+                        .HasForeignKey("ProjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("ModelCabinet.Server.Models.Tag", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tag");
+                });
+
+            modelBuilder.Entity("ModelCabinet.Server.Models.Asset", b =>
+                {
+                    b.Navigation("AssetTags");
+                });
+
             modelBuilder.Entity("ModelCabinet.Server.Models.Project", b =>
                 {
                     b.Navigation("Assets");
+
+                    b.Navigation("ProjectTags");
                 });
 #pragma warning restore 612, 618
         }
diff --git a/modelcabinet.client/src/app/Models/asset.ts b/modelcabinet.client/src/app/Models/asset.ts
index a7f4b5f..10e0fa8 100644
--- a/modelcabinet.client/src/app/Models/asset.ts
+++ b/modelcabinet.client/src/app/Models/asset.ts
@@ -9,6 +9,9 @@ export interface Asset {
   fileSize: number, 
   projectId: number,
   assetTags: AssetTag[]
+
+  // Read-only property
+  readonly assetTagNames: string[]
 }
 
 // Used to Match the structure in the backend
@@ -27,5 +30,6 @@ export const emptyAsset: Asset = {
   dateUpdated: new Date("2025-03-10"),
   fileSize: 0,
   projectId: 0,
-  assetTags: []
-}
\ No newline at end of file
+  assetTags: [],
+  get assetTagNames() { return []; }
+}
diff --git a/modelcabinet.client/src/app/asset-utils.ts b/modelcabinet.client/src/app/asset-utils.ts
new file mode 100644
index 0000000..1ff87de
--- /dev/null
+++ b/modelcabinet.client/src/app/asset-utils.ts
@@ -0,0 +1,41 @@
+import { Asset } from './Models/asset';
+
+/**
+ * Returns an array of tag names from an asset's assetTags array
+ * @param asset The asset to extract tag names from
+ * @returns string[] Array of tag names
+ */
+export function getAssetTagNames(asset: Asset): string[] {
+  if (!asset.assetTags || asset.assetTags.length === 0) {
+    return [];
+  }
+
+  return asset.assetTags.map(assetTag => assetTag.tag.tagName);
+}
+
+/**
+ * Creates a new Asset object with assetTagNames getter implemented
+ * @param asset Original asset object from API
+ * @returns Asset with assetTagNames getter implemented
+ */
+export function createAssetWithTagNames(asset: Asset): Asset {
+  // Create a new object with everything from the original asset
+  const processedAsset = {
+    ...asset,
+    // Define getter for assetTagNames
+    get assetTagNames(): string[] {
+      return getAssetTagNames(this);
+    }
+  };
+
+  return processedAsset;
+}
+
+/**
+ * Process multiple assets to add assetTagNames getters
+ * @param assets Array of assets from API
+ * @returns Array of assets with assetTagNames getters
+ */
+export function processAssetsWithTagNames(assets: Asset[]): Asset[] {
+  return assets.map(asset => createAssetWithTagNames(asset));
+}
diff --git a/modelcabinet.client/src/app/data.service.ts b/modelcabinet.client/src/app/data.service.ts
index f7d1a73..49e44c3 100644
--- a/modelcabinet.client/src/app/data.service.ts
+++ b/modelcabinet.client/src/app/data.service.ts
@@ -4,6 +4,7 @@ import { BehaviorSubject, Observable, tap } from "rxjs";
 import { emptyProject, Project } from "./Models/project";
 import { Asset, emptyAsset } from "./Models/asset";
 import { emptyTag, Tag } from "./Models/tag";
+import { createAssetWithTagNames, processAssetsWithTagNames } from "./asset-utils";
 //import { Tag } from "./Models/tag";
 
 
@@ -57,9 +58,19 @@ export class DataService {
   }
 
   getProjectById(id: number) {
-    this.http.get<Project>(`/api/Projects/${id}`).subscribe(data => {
-      this.project$.next(data);
-      // this.assets$.next(data.asset.&values);
+    this.http.get<Project>(`/api/Projects/${id}`).subscribe({
+      next: (data) => {
+        // Process assets in the project
+        if (data.assets && data.assets.length > 0) {
+          data.assets = processAssetsWithTagNames(data.assets);
+        }
+        console.log("Project loaded successfully:", data);
+        this.project$.next(data);
+      },
+      error: (err) => {
+        console.error("Error loading project:", err);
+        // Don't update the BehaviorSubject with invalid data
+      }
     });
   }
 
@@ -93,31 +104,40 @@ export class DataService {
 
   createAsset(asset: Asset) {
     this.http.post<Asset>(`/api/Assets`, asset).subscribe(data => {
-      this.asset$.next(data);
+      const processedAsset = createAssetWithTagNames(data);
+      this.asset$.next(processedAsset);
     });
   }
 
   getAllAssets() {
     this.http.get<Asset[]>(`/api/Assets`).subscribe(data => {
-      this.assets$.next(data);
+      // Process assets to add the assetTagNames property
+      const processedAssets = processAssetsWithTagNames(data);
+      this.assets$.next(processedAssets);
     });
   }
 
   getAssetsById(id: number) {
     this.http.get<Asset>(`/api/Assets/${id}`).subscribe(data => {
-      this.asset$.next(data);
-    })
+      // Add the assetTagNames property
+      const processedAsset = createAssetWithTagNames(data);
+      this.asset$.next(processedAsset);
+    });
   }
 
-  updateAssetById(id:number, asset: Asset) {
+  updateAssetById(id: number, asset: Asset) {
     this.http.put<Asset>(`/api/Assets/${id}`, asset).subscribe(data => {
-      this.asset$.next(data);
+      const processedAsset = createAssetWithTagNames(data);
+      this.asset$.next(processedAsset);
     });
   }
 
   deleteAssetById(id: number) {
     this.http.delete<Asset>(`/api/Assets/${id}`).subscribe(data => {
-      this.asset$.next(data);
+      if (data) {
+        const processedAsset = createAssetWithTagNames(data);
+        this.asset$.next(processedAsset);
+      }
     });
   }
 
@@ -157,4 +177,17 @@ export class DataService {
       return data;
     });
   }
+
+  getAllUniqueTags(): string[] {
+    const assets = this.assets$.value;
+    const allTags = new Set<string>();
+
+    assets.forEach(asset => {
+      if (asset.assetTagNames) {
+        asset.assetTagNames.forEach(tag => allTags.add(tag));
+      }
+    });
+
+    return Array.from(allTags).sort();
+  }
 }
diff --git a/modelcabinet.client/src/app/projects/project-page/project-page.component.html b/modelcabinet.client/src/app/projects/project-page/project-page.component.html
index 1fbab51..4d50dc9 100644
--- a/modelcabinet.client/src/app/projects/project-page/project-page.component.html
+++ b/modelcabinet.client/src/app/projects/project-page/project-page.component.html
@@ -1,37 +1,46 @@
-@let project = project$ | async;
+<!-- Loading indicator -->
+<div class="container mt-4" *ngIf="isLoading">
+  <div class="d-flex justify-content-center">
+    <div class="spinner-border text-primary" role="status">
+      <span class="visually-hidden">Loading...</span>
+    </div>
+  </div>
+  <p class="text-center mt-2">Loading project data...</p>
+</div>
 
-<div class="container mt-4" *ngIf="project">
+<!-- Project display -->
+<div class="container mt-4" *ngIf="!isLoading && project$.value && project$.value.projectId">
   <div class="row">
     <!-- 3D Model Viewer -->
     <div class="col-12 col-md-6 mb-3">
-      <app-viewport #viewport [stlModels]="[project!.assets[0].path]"></app-viewport>
+      <app-viewport #viewport [stlModels]="project$.value.assets && project$.value.assets.length > 0 ? [project$.value.assets[0].path] : []"></app-viewport>
     </div>
 
     <!-- Project Information -->
     <div class="col-12 col-md-6">
-      <h1 class="text-center">{{ project!.name }}</h1>
+      <h1 class="text-center">{{ project$.value.name }}</h1>
       <p class="text-muted text-center"><b>Description:</b></p>
-      <p class="h5 text-center">{{ project!.shortDescription }}</p>
+      <p class="h5 text-center">{{ project$.value.shortDescription }}</p>
 
       <!-- Author and Dates -->
       <div class="row text-center mt-3">
         <div class="col-6">
-          <p><b>Author:</b> <br /><span class="h5">{{ project!.author }}</span></p>
+          <p><b>Author:</b> <br /><span class="h5">{{ project$.value.author }}</span></p>
         </div>
         <div class="col-6">
-          <p><b>Creation Date:</b> <br /><span class="h5">{{ project!.creationDate | date:'short' }}</span></p>
+          <p><b>Creation Date:</b> <br /><span class="h5">{{ project$.value.creationDate | date:'short' }}</span></p>
         </div>
       </div>
       <div class="row text-center">
         <div class="col-6">
-          <p><b>Modified Date:</b> <br /><span class="h5">{{ project!.modifiedDate | date:'short' }}</span></p>
+          <p><b>Modified Date:</b> <br /><span class="h5">{{ project$.value.modifiedDate | date:'short' }}</span></p>
         </div>
       </div>
 
       <!-- Asset Controls -->
-      <div class="viewport-controls">
+      <div class="viewport-controls" *ngIf="project$.value.assets && project$.value.assets.length > 0">
         <ul class="list-group">
-          <li class="list-group-item" *ngFor="let asset of project!.assets">
+          <li class="list-group-item" *ngFor="let asset of project$.value.assets">
             <button class="btn btn-sm btn-info w-100" (click)="loadAsset(asset)">Load</button>
             <span class="d-block mt-2">{{ asset.name }}</span>
           </li>
@@ -39,54 +48,63 @@ <h1 class="text-center">{{ project!.name }}</h1>
       </div>
 
       <!-- Tags -->
-      <div class="mt-3">
+      <div class="mt-3" *ngIf="project$.value.projectTags && project$.value.projectTags.length > 0">
         <span class="fw-bold">Tags:</span>
         <div class="d-flex flex-wrap justify-content-center mt-2">
-          <app-tag-label class="m-1" *ngFor="let projectTag of project!.projectTags" [tagLabel]="projectTag.tag"></app-tag-label>
+          <app-tag-label class="m-1" *ngFor="let projectTag of project$.value.projectTags" [tagLabel]="projectTag.tag"></app-tag-label>
+        </div>
+      </div>
+    </div>
+
+    <!-- Filter by Tag -->
+    <div class="col-12 mt-4 mb-2" *ngIf="uniqueTagNames.length > 0">
+      <div class="card">
+        <div class="card-body">
+          <h5 class="card-title">Filter Assets by Tag</h5>
+          <div class="row">
+            <div class="col-9">
+              <select class="form-select" [(ngModel)]="selectedTagName">
+                <option value="">All Tags</option>
+                <option *ngFor="let tagName of uniqueTagNames" [value]="tagName">{{ tagName }}</option>
+              </select>
+            </div>
+            <div class="col-3">
+              <button class="btn btn-secondary" (click)="clearTagFilter()">Clear</button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
 
     <!-- Assets Included in Project -->
-    <div class="col-12 text-center h5 mt-4"><b>Assets Included In Project:</b></div>
-    <div class="col-12">
+    <div class="col-12 text-center h5 mt-4" *ngIf="project$.value.assets && project$.value.assets.length > 0"><b>Assets Included In Project:</b></div>
+    <div class="col-12" *ngIf="project$.value.assets && project$.value.assets.length > 0">
       <div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4">
-        <div class="col" *ngFor="let asset of project!.assets">
+        <div class="col" *ngFor="let asset of filteredAssets">
           <app-asset-detail [asset]="asset" (editRequested)="setAsset($event)"></app-asset-detail>
         </div>
       </div>
+      <!-- Add a message when no assets match the filter -->
+      <div *ngIf="filteredAssets.length === 0" class="alert alert-info text-center mt-3">
+        No assets match the selected tag filter.
+      </div>
+    </div>
+
+    <!-- No assets message -->
+    <div class="col-12" *ngIf="!project$.value.assets || project$.value.assets.length === 0">
+      <div class="alert alert-info text-center mt-3">
+        This project has no assets.
+      </div>
     </div>
   </div>
 </div>
 
-<!-- Modal for Editing Asset -->
-<div class="modal fade" id="editAssetModal" tabindex="-1" aria-labelledby="editAssetModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="editAssetModalLabel">Edit Asset</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-      <div class="modal-body">
-        <form *ngIf="selectedAsset">
-          <div class="mb-3">
-            <label for="assetName" class="form-label">Asset Name</label>
-            <input type="text" class="form-control" id="assetName" [(ngModel)]="selectedAsset.name" name="assetName" />
-          </div>
-          <div class="mb-3">
-            <label for="assetPath" class="form-label">Asset Path</label>
-            <input type="text" class="form-control" id="assetPath" [(ngModel)]="selectedAsset.path" name="assetPath" />
-          </div>
-          <div class="mb-3">
-            <label for="assetSize" class="form-label">File Size</label>
-            <input type="number" class="form-control" id="assetSize" [(ngModel)]="selectedAsset.fileSize" name="assetSize" />
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" (click)="saveAsset()" data-bs-dismiss="modal">Save Changes</button>
-      </div>
+<!-- Error message if project not found -->
+<div class="container mt-4" *ngIf="!isLoading && (!project$.value || !project$.value.projectId)">
+  <div class="alert alert-danger">
+    <p class="text-center">Project not found or unable to load project data.</p>
+    <div class="text-center mt-3">
+      <button class="btn btn-primary" routerLink="/projects">Return to Projects</button>
     </div>
   </div>
 </div>
@@ -94,5 +112,5 @@ <h5 class="modal-title" id="editAssetModalLabel">Edit Asset</h5>
 <!-- Raw Data Viewer for Debugging -->
 <a class="dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">Show Raw Data</a>
 <ul class="dropdown-menu">
-  <li><pre>{{ project | json }}</pre></li>
+  <li><pre>{{ project$.value | json }}</pre></li>
 </ul>
diff --git a/modelcabinet.client/src/app/projects/project-page/project-page.component.ts b/modelcabinet.client/src/app/projects/project-page/project-page.component.ts
index 16077ca..15b024c 100644
--- a/modelcabinet.client/src/app/projects/project-page/project-page.component.ts
+++ b/modelcabinet.client/src/app/projects/project-page/project-page.component.ts
@@ -1,5 +1,5 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { Project } from '../../Models/project';
 import { Asset } from '../../Models/asset';
 import { DataService } from '../../data.service';
@@ -11,9 +11,45 @@ import { ViewportComponent } from '../../viewport/viewport.component';
   templateUrl: './project-page.component.html',
   styleUrl: './project-page.component.css'
 })
-export class ProjectPageComponent implements OnInit {
+export class ProjectPageComponent implements OnInit, OnDestroy {
   projid = 0;
   project$: BehaviorSubject<Project>;
+  projectSubscription: Subscription | null = null;
+  isLoading = true;
+
+  // Add selected tag property
+  selectedTagName: string = '';
+
+  // Computed property for filtered assets
+  get filteredAssets(): Asset[] {
+    if (!this.project$.value || !this.project$.value.assets) {
+      return [];
+    }
+
+    if (!this.selectedTagName) {
+      return this.project$.value.assets;
+    }
+
+    return this.project$.value.assets.filter(asset =>
+      asset.assetTagNames && asset.assetTagNames.includes(this.selectedTagName)
+    );
+  }
+
+  // Computed property for all unique tags in the project
+  get uniqueTagNames(): string[] {
+    if (!this.project$.value || !this.project$.value.assets) {
+      return [];
+    }
+
+    const tags = new Set<string>();
+    this.project$.value.assets.forEach(asset => {
+      if (asset.assetTagNames) {
+        asset.assetTagNames.forEach(tag => tags.add(tag));
+      }
+    });
+
+    return Array.from(tags).sort();
+  }
 
   @ViewChild('viewport') viewport!: ViewportComponent;
 
@@ -47,19 +83,36 @@ export class ProjectPageComponent implements OnInit {
     this.viewport.load(asset);
   }
 
+  // Reset tag filter
+  clearTagFilter() {
+    this.selectedTagName = '';
+  }
+
   constructor(private route: ActivatedRoute, private data: DataService, private router: Router) {
     this.project$ = this.data.project$;
   }
 
   getProjectData(): void {
+    this.isLoading = true;
     this.route.paramMap.subscribe(data => {
       this.projid = +data.get('id')!;
+
+      // Add explicit subscription to detect data loading
       this.data.getProjectById(this.projid);
-      console.log(this.project$, this.projid);
+      this.projectSubscription = this.project$.subscribe(project => {
+        console.log("Project data loaded:", project);
+        this.isLoading = false;
+      });
     });
   }
 
   ngOnInit(): void {
     this.getProjectData();
   }
+
+  ngOnDestroy(): void {
+    if (this.projectSubscription) {
+      this.projectSubscription.unsubscribe();
+    }
+  }
 }