diff --git a/SoarCraft.AwaiShop/AdminHub/Product/Patch.cs b/SoarCraft.AwaiShop/AdminHub/Product/Patch.cs
index 3312a1e..4abe83a 100644
--- a/SoarCraft.AwaiShop/AdminHub/Product/Patch.cs
+++ b/SoarCraft.AwaiShop/AdminHub/Product/Patch.cs
@@ -35,7 +35,7 @@ public async Task<bool> ProductPatchName(uint prodId, string name) {
      * <remarks>
      * @author Aloento
      * @since 0.1.0
-     * @version 1.0.0
+     * @version 1.1.0
      * </remarks>
      */
     public async Task<bool> ProductPatchCategory(uint prodId, string name) {
@@ -46,23 +46,34 @@ public async Task<bool> ProductPatchCategory(uint prodId, string name) {
         if (!valid.IsValid(name))
             throw new HubException(valid.FormatErrorMessage("Name"));
 
-        var newCate = await this.Db.Categories
-                          .Where(x => x.Name == name)
-                          .SingleOrDefaultAsync()
-                      ?? (await this.Db.Categories.AddAsync(new() {
-                          Name = name
-                      })).Entity;
-
         var prod = await this.Db.Products
-            .Include(x => x.Category)
             .SingleAsync(x => x.ProductId == prodId);
 
-        var inUse = await this.Db.Products
-            .Where(x => x.CategoryId == prod.CategoryId && x.ProductId != prod.ProductId)
-            .AnyAsync();
-
-        if (!inUse)
-            this.Db.Categories.Remove(prod.Category!);
+        var newCate = await this.Db.Categories
+            .Where(x => x.Name == name)
+            .SingleOrDefaultAsync();
+
+        if (newCate is null)
+            newCate = (await this.Db.Categories.AddAsync(new() {
+                Name = name
+            })).Entity;
+        else {
+            if (prod.CategoryId == newCate.CategoryId)
+                return true;
+
+            if (prod.CategoryId is not null) {
+                var inUse = await this.Db.Products
+                    .Where(x =>
+                        x.CategoryId == prod.CategoryId &&
+                        x.ProductId != prod.ProductId)
+                    .AnyAsync();
+
+                if (!inUse)
+                    await this.Db.Categories
+                         .Where(x => x.CategoryId == prod.CategoryId)
+                         .ExecuteDeleteAsync();
+            }
+        }
 
         prod.Category = newCate;
 
diff --git a/src/Pages/Admin/Product/Category.tsx b/src/Pages/Admin/Product/Category.tsx
index 6abedf2..84f4dda 100644
--- a/src/Pages/Admin/Product/Category.tsx
+++ b/src/Pages/Admin/Product/Category.tsx
@@ -119,7 +119,13 @@ export function AdminProductCategory({ ProdId }: { ProdId: number; }) {
       </Combobox>
 
       {edit
-        ? <Button appearance="subtle" icon={<SendRegular />} onClick={() => cate && run(ProdId, cate)} />
+        ? <Button appearance="subtle" icon={<SendRegular />} onClick={() => {
+          if (cate)
+            run(ProdId, cate)
+          else {
+
+          }
+        }} />
         : <Button appearance="subtle" icon={<EditRegular />} onClick={setTrue} />}
     </div>
   );
diff --git a/src/Pages/Gallery/Card.tsx b/src/Pages/Gallery/Card.tsx
index 4b3d58e..bb6e4bd 100644
--- a/src/Pages/Gallery/Card.tsx
+++ b/src/Pages/Gallery/Card.tsx
@@ -1,4 +1,4 @@
-import { Card, CardFooter, CardPreview, Link, makeStyles, tokens } from "@fluentui/react-components";
+import { Card, CardFooter, CardPreview, Link, Subtitle2, makeStyles, tokens } from "@fluentui/react-components";
 import { useRequest } from "ahooks";
 import { GuidImage } from "~/Helpers/GuidImage";
 import { Logger } from "~/Helpers/Logger";
@@ -28,7 +28,7 @@ const log = new Logger("Gallery", "Category", "Card");
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.1.4
+ * @version 0.1.5
  */
 export function GalleryCard({ Id }: { Id: number }) {
   const style = useStyles();
@@ -43,7 +43,9 @@ export function GalleryCard({ Id }: { Id: number }) {
       </CardPreview>
 
       <CardFooter>
-        <Link href={`/Product/${Id}`}>{data?.Name || "Loading..."}</Link>
+        <Subtitle2>
+          <Link href={`/Product/${Id}`}>{data?.Name || "Loading..."}</Link>
+        </Subtitle2>
       </CardFooter>
     </Card>
   )