diff --git a/TSystems.LoveOTC/Migrations/20240304140921_SplitName.Designer.cs b/TSystems.LoveOTC/Migrations/20240304140921_SplitName.Designer.cs
new file mode 100644
index 0000000..d00a32c
--- /dev/null
+++ b/TSystems.LoveOTC/Migrations/20240304140921_SplitName.Designer.cs
@@ -0,0 +1,588 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using TSystems.LoveOTC;
+
+#nullable disable
+
+namespace TSystems.LoveOTC.Migrations
+{
+    [DbContext(typeof(ShopContext))]
+    [Migration("20240304140921_SplitName")]
+    partial class SplitName
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.2")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            NpgsqlModelBuilderExtensions.UseHiLo(modelBuilder, "EntityFrameworkHiLoSequence");
+
+            modelBuilder.HasSequence("EntityFrameworkHiLoSequence")
+                .IncrementsBy(10);
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Category", b =>
+                {
+                    b.Property<long>("CategoryId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("CategoryId"));
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(15)
+                        .HasColumnType("character varying(15)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("CategoryId");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Categories");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Combo", b =>
+                {
+                    b.Property<long>("ComboId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("ComboId"));
+
+                    b.Property<bool?>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<long>("ProductId")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("Stock")
+                        .HasColumnType("integer");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComboId");
+
+                    b.HasIndex("ProductId");
+
+                    b.ToTable("Combos");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.ComboType", b =>
+                {
+                    b.Property<long>("ComboId")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("TypeId")
+                        .HasColumnType("bigint");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComboId", "TypeId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("ComboTypes");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Comment", b =>
+                {
+                    b.Property<long>("CommentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("CommentId"));
+
+                    b.Property<string>("Content")
+                        .IsRequired()
+                        .HasMaxLength(1000)
+                        .HasColumnType("character varying(1000)");
+
+                    b.Property<DateTime>("CreateAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("timestamp without time zone");
+
+                    b.Property<long>("OrderId")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("CommentId");
+
+                    b.HasIndex("OrderId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Comments");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Order", b =>
+                {
+                    b.Property<long>("OrderId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("OrderId"));
+
+                    b.Property<DateTime>("CreateAt")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("timestamp without time zone");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("integer");
+
+                    b.Property<string>("TrackingNumber")
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("uuid");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("OrderId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.OrderCombo", b =>
+                {
+                    b.Property<long>("ComboId")
+                        .HasColumnType("bigint");
+
+                    b.Property<long>("OrderId")
+                        .HasColumnType("bigint");
+
+                    b.Property<byte>("Quantity")
+                        .HasColumnType("smallint");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ComboId", "OrderId");
+
+                    b.HasIndex("OrderId");
+
+                    b.ToTable("OrderCombos");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Photo", b =>
+                {
+                    b.Property<long>("PhotoId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("PhotoId"));
+
+                    b.Property<string>("Caption")
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<Guid>("ObjectId")
+                        .HasColumnType("uuid");
+
+                    b.Property<byte>("Order")
+                        .HasColumnType("smallint");
+
+                    b.Property<long>("ProductId")
+                        .HasColumnType("bigint");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("PhotoId");
+
+                    b.HasIndex("ObjectId");
+
+                    b.HasIndex("ProductId");
+
+                    b.ToTable("Photos");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Product", b =>
+                {
+                    b.Property<long>("ProductId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("ProductId"));
+
+                    b.Property<long?>("CategoryId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(65535)
+                        .HasColumnType("json");
+
+                    b.Property<bool?>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("character varying(50)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("CategoryId");
+
+                    b.HasIndex("Name")
+                        .IsUnique();
+
+                    b.ToTable("Products");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Storage", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<byte[]>("Data")
+                        .IsRequired()
+                        .HasMaxLength(10485760)
+                        .HasColumnType("bytea");
+
+                    b.Property<DateTime?>("Expires")
+                        .HasColumnType("timestamp with time zone")
+                        .HasColumnName("timestamp without time zone");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Objects");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Type", b =>
+                {
+                    b.Property<long>("TypeId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("TypeId"));
+
+                    b.Property<bool?>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(15)
+                        .HasColumnType("character varying(15)");
+
+                    b.Property<long>("VariantId")
+                        .HasColumnType("bigint");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("TypeId");
+
+                    b.HasIndex("VariantId", "Name")
+                        .IsUnique();
+
+                    b.ToTable("Types");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.User", b =>
+                {
+                    b.Property<Guid>("UserId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<bool?>("Admin")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("EMail")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("character varying(100)");
+
+                    b.Property<string>("Forename")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.Property<string>("Phone")
+                        .IsRequired()
+                        .HasMaxLength(15)
+                        .HasColumnType("character varying(15)");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("UserId");
+
+                    b.HasIndex("EMail")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Variant", b =>
+                {
+                    b.Property<long>("VariantId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    NpgsqlPropertyBuilderExtensions.UseHiLo(b.Property<long>("VariantId"));
+
+                    b.Property<bool?>("IsArchived")
+                        .HasColumnType("boolean");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(15)
+                        .HasColumnType("character varying(15)");
+
+                    b.Property<long>("ProductId")
+                        .HasColumnType("bigint");
+
+                    b.Property<uint>("Version")
+                        .IsConcurrencyToken()
+                        .ValueGeneratedOnAddOrUpdate()
+                        .HasColumnType("xid")
+                        .HasColumnName("xmin");
+
+                    b.HasKey("VariantId");
+
+                    b.HasIndex("ProductId", "Name")
+                        .IsUnique();
+
+                    b.ToTable("Variants");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Combo", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Product", "Product")
+                        .WithMany("Combos")
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Product");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.ComboType", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Combo", "Combo")
+                        .WithMany("ComboTypes")
+                        .HasForeignKey("ComboId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("TSystems.LoveOTC.Models.Type", "Type")
+                        .WithMany("ComboTypes")
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Combo");
+
+                    b.Navigation("Type");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Comment", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Order", "Order")
+                        .WithMany("Comments")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("TSystems.LoveOTC.Models.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId");
+
+                    b.Navigation("Order");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Order", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.OrderCombo", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Combo", "Combo")
+                        .WithMany("OrderCombos")
+                        .HasForeignKey("ComboId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("TSystems.LoveOTC.Models.Order", "Order")
+                        .WithMany("OrderCombos")
+                        .HasForeignKey("OrderId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Combo");
+
+                    b.Navigation("Order");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Photo", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Storage", "Object")
+                        .WithMany()
+                        .HasForeignKey("ObjectId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("TSystems.LoveOTC.Models.Product", "Product")
+                        .WithMany("Photos")
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Object");
+
+                    b.Navigation("Product");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Product", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Category", "Category")
+                        .WithMany("Products")
+                        .HasForeignKey("CategoryId");
+
+                    b.Navigation("Category");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Type", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Variant", "Variant")
+                        .WithMany("Types")
+                        .HasForeignKey("VariantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Variant");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Variant", b =>
+                {
+                    b.HasOne("TSystems.LoveOTC.Models.Product", "Product")
+                        .WithMany("Variants")
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Product");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Category", b =>
+                {
+                    b.Navigation("Products");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Combo", b =>
+                {
+                    b.Navigation("ComboTypes");
+
+                    b.Navigation("OrderCombos");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Order", b =>
+                {
+                    b.Navigation("Comments");
+
+                    b.Navigation("OrderCombos");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Product", b =>
+                {
+                    b.Navigation("Combos");
+
+                    b.Navigation("Photos");
+
+                    b.Navigation("Variants");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Type", b =>
+                {
+                    b.Navigation("ComboTypes");
+                });
+
+            modelBuilder.Entity("TSystems.LoveOTC.Models.Variant", b =>
+                {
+                    b.Navigation("Types");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/TSystems.LoveOTC/Migrations/20240304140921_SplitName.cs b/TSystems.LoveOTC/Migrations/20240304140921_SplitName.cs
new file mode 100644
index 0000000..9b75677
--- /dev/null
+++ b/TSystems.LoveOTC/Migrations/20240304140921_SplitName.cs
@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace TSystems.LoveOTC.Migrations
+{
+    /// <inheritdoc />
+    public partial class SplitName : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Name",
+                table: "Users");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Forename",
+                table: "Users",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Surname",
+                table: "Users",
+                type: "character varying(20)",
+                maxLength: 20,
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Forename",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "Surname",
+                table: "Users");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Name",
+                table: "Users",
+                type: "character varying(50)",
+                maxLength: 50,
+                nullable: false,
+                defaultValue: "");
+        }
+    }
+}
diff --git a/TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs b/TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs
index e432ae7..61431ab 100644
--- a/TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs
+++ b/TSystems.LoveOTC/Migrations/ShopContextModelSnapshot.cs
@@ -353,16 +353,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasMaxLength(100)
                         .HasColumnType("character varying(100)");
 
-                    b.Property<string>("Name")
+                    b.Property<string>("Forename")
                         .IsRequired()
-                        .HasMaxLength(50)
-                        .HasColumnType("character varying(50)");
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
 
                     b.Property<string>("Phone")
                         .IsRequired()
                         .HasMaxLength(15)
                         .HasColumnType("character varying(15)");
 
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasMaxLength(20)
+                        .HasColumnType("character varying(20)");
+
                     b.Property<uint>("Version")
                         .IsConcurrencyToken()
                         .ValueGeneratedOnAddOrUpdate()
diff --git a/src/Components/Setting.tsx b/src/Components/Setting.tsx
index 379fbcd..89417b5 100644
--- a/src/Components/Setting.tsx
+++ b/src/Components/Setting.tsx
@@ -1,4 +1,4 @@
-import { Button, Dialog, DialogActions, DialogBody, DialogContent, DialogSurface, DialogTitle, DialogTrigger, Field, Input, Toast, ToastBody, ToastTitle, Tooltip, makeStyles, tokens } from "@fluentui/react-components";
+import { Button, Dialog, DialogActions, DialogBody, DialogContent, DialogSurface, DialogTitle, DialogTrigger, Field, Input, Label, Toast, ToastBody, ToastTitle, Tooltip, makeStyles, tokens } from "@fluentui/react-components";
 import { useEffect, useState } from "react";
 import { useAuth } from "react-oidc-context";
 import { Logger } from "~/Helpers/Logger";
@@ -21,7 +21,7 @@ interface ISetting {
 /**
  * @author Aloento
  * @since 0.5.0
- * @version 0.1.0
+ * @version 0.2.0
  */
 const useStyles = makeStyles({
   box: {
@@ -32,6 +32,9 @@ const useStyles = makeStyles({
     ...Flex,
     columnGap: tokens.spacingVerticalXXXL
   },
+  fill: {
+    flexGrow: 1
+  }
 });
 
 const log = new Logger("Setting");
@@ -39,7 +42,7 @@ const log = new Logger("Setting");
 /**
  * @author Aloento
  * @since 0.1.0
- * @version 0.8.0
+ * @version 0.9.0
  */
 export function Setting({ Open, Toggle, New }: ISetting) {
   const style = useStyles();
@@ -49,7 +52,7 @@ export function Setting({ Open, Toggle, New }: ISetting) {
   const [forename, setForename] = useState<string>();
 
   const [phone, setPhone] = useState<string>();
-  const [address, setAddress] = useState<string>();
+  const [address, setAddress] = useState(Array<string>(5).fill(""));
 
   const { data, mutate } = Hub.User.Get.useMe(log);
 
@@ -61,7 +64,7 @@ export function Setting({ Open, Toggle, New }: ISetting) {
     setSurname(Surname);
     setForename(Forename);
     setPhone(Phone);
-    setAddress(Address);
+    setAddress(Address.split("; "));
   }, [data]);
 
   const { dispatch, dispatchToast } = useErrorToast(log);
@@ -118,8 +121,13 @@ export function Setting({ Open, Toggle, New }: ISetting) {
                 relationship="description"
                 withArrow
               >
-                <Field label="Family Name" size="large" required>
-                  <Input size="medium" value={surname} maxLength={20} onChange={(_, v) => setSurname(v.value)} />
+                <Field className={style.fill} label="Family Name" size="large" required>
+                  <Input
+                    size="medium"
+                    value={surname}
+                    maxLength={20}
+                    onChange={(_, v) => setSurname(v.value)}
+                  />
                 </Field>
               </Tooltip>
 
@@ -128,8 +136,14 @@ export function Setting({ Open, Toggle, New }: ISetting) {
                 relationship="description"
                 withArrow
               >
-                <Field label="Given Name" size="large" required>
-                  <Input size="medium" value={forename} maxLength={20} onChange={(_, v) => setForename(v.value)} />
+                <Field className={style.fill} label="Given Name" size="large" required>
+                  <Input
+                    className={style.fill}
+                    size="medium"
+                    value={forename}
+                    maxLength={20}
+                    onChange={(_, v) => setForename(v.value)}
+                  />
                 </Field>
               </Tooltip>
             </div>
@@ -141,7 +155,12 @@ export function Setting({ Open, Toggle, New }: ISetting) {
                 withArrow
               >
                 <Field label="Phone" size="large" required>
-                  <Input size="medium" value={phone} maxLength={20} onChange={(_, v) => setPhone(v.value)} />
+                  <Input
+                    size="medium"
+                    value={phone}
+                    maxLength={20}
+                    onChange={(_, v) => setPhone(v.value)}
+                  />
                 </Field>
               </Tooltip>
 
@@ -150,21 +169,79 @@ export function Setting({ Open, Toggle, New }: ISetting) {
                 relationship="description"
                 withArrow
               >
-                <Field label="E-Mail" size="large">
+                <Field className={style.fill} label="E-Mail" size="large">
                   <Input size="medium" value={auth.user?.profile.email} disabled />
                 </Field>
               </Tooltip>
             </div>
 
-            <Tooltip
-              content="Your full shipping address including street, number, ZIP, town and country. Separate lines by commas"
-              relationship="description"
-              withArrow
-            >
-              <Field label="Address" size="large" required>
-                <Input size="medium" value={address} maxLength={100} minLength={20} onChange={(_, v) => setAddress(v.value)} />
+            <Label size="large" required>
+              Address
+            </Label>
+
+            <Field hint="Street Address">
+              <Input
+                value={address[0]}
+                onChange={(_, v) => {
+                  address[0] = v.value;
+                  setAddress([...address]);
+                }}
+                maxLength={50}
+                minLength={10}
+              />
+            </Field>
+
+            <div className={style.one}>
+              <Field hint="City">
+                <Input
+                  value={address[1]}
+                  onChange={(_, v) => {
+                    address[1] = v.value;
+                    setAddress([...address]);
+                  }}
+                  maxLength={20}
+                  minLength={2}
+                />
               </Field>
-            </Tooltip>
+
+              <Field hint="State / Province">
+                <Input
+                  value={address[2]}
+                  onChange={(_, v) => {
+                    address[2] = v.value;
+                    setAddress([...address]);
+                  }}
+                  maxLength={20}
+                  minLength={2}
+                />
+              </Field>
+            </div>
+
+            <div className={style.one}>
+              <Field hint="Country">
+                <Input
+                  value={address[3]}
+                  onChange={(_, v) => {
+                    address[3] = v.value;
+                    setAddress([...address]);
+                  }}
+                  maxLength={10}
+                  minLength={2}
+                />
+              </Field>
+
+              <Field hint="Postal / Zip Code">
+                <Input
+                  value={address[4]}
+                  onChange={(_, v) => {
+                    address[3] = v.value;
+                    setAddress([...address]);
+                  }}
+                  maxLength={10}
+                  minLength={2}
+                />
+              </Field>
+            </div>
           </DialogContent>
 
           <DialogActions>
@@ -178,7 +255,7 @@ export function Setting({ Open, Toggle, New }: ISetting) {
               EMail: auth.user?.profile.email,
               Surname: surname,
               Forename: forename,
-              Address: address,
+              Address: address.join("; "),
               Phone: phone
             })}>
               Submit