diff --git a/.DS_Store b/.DS_Store
index 7f3454fd..52631e0c 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc
index 7df52c3a..55d6eebc 100644
Binary files a/inventory/__pycache__/forms.cpython-311.pyc and b/inventory/__pycache__/forms.cpython-311.pyc differ
diff --git a/inventory/__pycache__/models.cpython-311.pyc b/inventory/__pycache__/models.cpython-311.pyc
index b7905805..bfdafa1b 100644
Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ
diff --git a/inventory/forms.py b/inventory/forms.py
index af72a108..3458a5f0 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -4,6 +4,8 @@ from django.core.validators import MinLengthValidator
 from django.core.validators import RegexValidator
 from django import forms
 from django.contrib.auth import get_user_model
+from phonenumber_field.phonenumber import PhoneNumber
+
 from .mixins import AddClassMixin
 from django.forms.models import inlineformset_factory
 from .models import (
@@ -29,7 +31,7 @@ from .models import (
     Opportunity, Priority, Sources,
 )
 from django_ledger.models import ItemModel, InvoiceModel
-from django.forms import ModelMultipleChoiceField, ValidationError
+from django.forms import ModelMultipleChoiceField, ValidationError, DateInput
 from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 from django.forms import formset_factory
@@ -62,21 +64,21 @@ class StaffForm(forms.ModelForm):
         model = Staff
         fields = ["name", "arabic_name", "phone_number", "staff_type"]
 
-    # def __init__(self, *args, **kwargs):
-    #     user_instance = kwargs.get("instance")
-    #     if user_instance and user_instance.user:
-    #         initial = kwargs.setdefault("initial", {})
-    #         initial["email"] = user_instance.user.email
-    #     super().__init__(*args, **kwargs)
-    #
-    # def save(self, commit=True):
-    #     user_instance = super().save(commit=False)
-    #     user = user_instance.user
-    #     user.email = self.cleaned_data["email"]
-    #     if commit:
-    #         user.save()
-    #         user_instance.save()
-    #     return user_instance
+    def __init__(self, *args, **kwargs):
+        user_instance = kwargs.get("instance")
+        if user_instance and user_instance.user:
+            initial = kwargs.setdefault("initial", {})
+            initial["email"] = user_instance.user.email
+        super().__init__(*args, **kwargs)
+
+    def save(self, commit=True):
+        user_instance = super().save(commit=False)
+        user = user_instance.user
+        user.email = self.cleaned_data["email"]
+        if commit:
+            user.save()
+            user_instance.save()
+        return user_instance
 
 
 # Dealer Form
@@ -99,16 +101,23 @@ class CustomerForm(forms.ModelForm, AddClassMixin):
     class Meta:
         model = Customer
         fields = [
+            "title",
             "first_name",
             "middle_name",
             "last_name",
+            "gender",
+            "dob",
             "email",
             "national_id",
+            "city",
             "phone_number",
             "address",
-            "country"
         ]
-        widgets = {"country": CountrySelectWidget()}
+        widgets = {
+            "phone_number": forms.TextInput(attrs={"class": "phone"}),
+            "dob": forms.DateInput(attrs={"type": "date"}),
+        }
+
 
 
 class CarForm(
diff --git a/inventory/migrations/0010_customer_staff.py b/inventory/migrations/0010_customer_staff.py
new file mode 100644
index 00000000..ab0bdd30
--- /dev/null
+++ b/inventory/migrations/0010_customer_staff.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.1.4 on 2025-01-09 11:36
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0009_alter_staff_managers'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customer',
+            name='staff',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='customer_staff', to='inventory.staff', verbose_name='Staff'),
+        ),
+    ]
diff --git a/inventory/migrations/0011_remove_customer_country_customer_city.py b/inventory/migrations/0011_remove_customer_country_customer_city.py
new file mode 100644
index 00000000..29473352
--- /dev/null
+++ b/inventory/migrations/0011_remove_customer_country_customer_city.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.1.4 on 2025-01-09 20:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0010_customer_staff'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customer',
+            name='country',
+        ),
+        migrations.AddField(
+            model_name='customer',
+            name='city',
+            field=models.CharField(blank=True, max_length=255, verbose_name='City'),
+        ),
+    ]
diff --git a/inventory/models.py b/inventory/models.py
index 6f0bf0c5..80a2b891 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -824,6 +824,8 @@ class Customer(models.Model):
     lead = models.OneToOneField(Lead, on_delete=models.SET_NULL, null=True, blank=True,
                                 related_name="converted", verbose_name=_("Lead"))
     dealer = models.ForeignKey(Dealer, on_delete=models.CASCADE,related_name="customers")
+    staff = models.ForeignKey(Staff, on_delete=models.SET_NULL, null=True, related_name="customer_staff",
+                              verbose_name=_("Staff"))
     title = models.CharField(choices=Title.choices, default=Title.NA, max_length=10, verbose_name=_("Title"))
     first_name = models.CharField(max_length=50, verbose_name=_("First Name"))
     middle_name = models.CharField(max_length=50, blank=True, null=True, verbose_name=_("Middle Name"))
@@ -832,8 +834,8 @@ class Customer(models.Model):
     dob = models.DateField(verbose_name=_("Date of Birth"))
     email = models.EmailField(unique=True, verbose_name=_("Email"))
     national_id = models.CharField(max_length=10, unique=True, verbose_name=_("National ID"))
-    country = CountryField(blank=True, verbose_name=_("Country"))
     phone_number = PhoneNumberField(region="SA", unique=True, verbose_name=_("Phone Number"))
+    city = models.CharField(max_length=255, blank=True, verbose_name=_("City"))
     address = models.CharField(max_length=200, blank=True, null=True, verbose_name=_("Address"))
     created = models.DateTimeField(auto_now_add=True, verbose_name=_("Created"))
     updated = models.DateTimeField(auto_now=True, verbose_name=_("Updated"))
diff --git a/static/.DS_Store b/static/.DS_Store
index a442dcf5..3da6e0b4 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ
diff --git a/static/flags/AA.gif b/static/flags/AA.gif
deleted file mode 100644
index 3f07a5bf..00000000
Binary files a/static/flags/AA.gif and /dev/null differ
diff --git a/static/flags/AC.gif b/static/flags/AC.gif
deleted file mode 100644
index 6a5570f3..00000000
Binary files a/static/flags/AC.gif and /dev/null differ
diff --git a/static/flags/AE.gif b/static/flags/AE.gif
index 9c92c1a9..cecae610 100644
Binary files a/static/flags/AE.gif and b/static/flags/AE.gif differ
diff --git a/static/flags/AF.gif b/static/flags/AF.gif
index 2239e847..ab546726 100644
Binary files a/static/flags/AF.gif and b/static/flags/AF.gif differ
diff --git a/static/flags/AG.gif b/static/flags/AG.gif
index b6976367..e0878055 100644
Binary files a/static/flags/AG.gif and b/static/flags/AG.gif differ
diff --git a/static/flags/AJ.gif b/static/flags/AJ.gif
deleted file mode 100644
index cdaa445a..00000000
Binary files a/static/flags/AJ.gif and /dev/null differ
diff --git a/static/flags/AL.gif b/static/flags/AL.gif
index 3f849966..448e65cb 100644
Binary files a/static/flags/AL.gif and b/static/flags/AL.gif differ
diff --git a/static/flags/AM.gif b/static/flags/AM.gif
index 29b30657..8665fe45 100644
Binary files a/static/flags/AM.gif and b/static/flags/AM.gif differ
diff --git a/static/flags/AN.gif b/static/flags/AN.gif
deleted file mode 100644
index a3ca692f..00000000
Binary files a/static/flags/AN.gif and /dev/null differ
diff --git a/static/flags/AO.gif b/static/flags/AO.gif
index c342c3a0..4a49238e 100644
Binary files a/static/flags/AO.gif and b/static/flags/AO.gif differ
diff --git a/static/flags/AQ.gif b/static/flags/AQ.gif
index 092edc8d..5e299d16 100644
Binary files a/static/flags/AQ.gif and b/static/flags/AQ.gif differ
diff --git a/static/flags/AR.gif b/static/flags/AR.gif
index 218180a6..56918bfc 100644
Binary files a/static/flags/AR.gif and b/static/flags/AR.gif differ
diff --git a/static/flags/AS.gif b/static/flags/AS.gif
index 1cc0e2ab..9efdf378 100644
Binary files a/static/flags/AS.gif and b/static/flags/AS.gif differ
diff --git a/static/flags/AT.gif b/static/flags/AT.gif
index 80819a9b..0111bb5d 100644
Binary files a/static/flags/AT.gif and b/static/flags/AT.gif differ
diff --git a/static/flags/AU.gif b/static/flags/AU.gif
index 471a19be..08945485 100644
Binary files a/static/flags/AU.gif and b/static/flags/AU.gif differ
diff --git a/static/flags/AV.gif b/static/flags/AV.gif
deleted file mode 100644
index bd40a4d7..00000000
Binary files a/static/flags/AV.gif and /dev/null differ
diff --git a/static/flags/AX.gif b/static/flags/AX.gif
index 06dd323d..ce20077d 100644
Binary files a/static/flags/AX.gif and b/static/flags/AX.gif differ
diff --git a/static/flags/BA.gif b/static/flags/BA.gif
index 07d24e0d..e957194e 100644
Binary files a/static/flags/BA.gif and b/static/flags/BA.gif differ
diff --git a/static/flags/BB.gif b/static/flags/BB.gif
index 4936710b..7f3e77ed 100644
Binary files a/static/flags/BB.gif and b/static/flags/BB.gif differ
diff --git a/static/flags/BC.gif b/static/flags/BC.gif
deleted file mode 100644
index 8c8b13ee..00000000
Binary files a/static/flags/BC.gif and /dev/null differ
diff --git a/static/flags/BD.gif b/static/flags/BD.gif
index 1d079308..c91a1f89 100644
Binary files a/static/flags/BD.gif and b/static/flags/BD.gif differ
diff --git a/static/flags/BE.gif b/static/flags/BE.gif
index 8346a78a..a0dcccfd 100644
Binary files a/static/flags/BE.gif and b/static/flags/BE.gif differ
diff --git a/static/flags/BF.gif b/static/flags/BF.gif
index 89b6ff45..323d3b71 100644
Binary files a/static/flags/BF.gif and b/static/flags/BF.gif differ
diff --git a/static/flags/BG.gif b/static/flags/BG.gif
index 27c3c8a4..e87028be 100644
Binary files a/static/flags/BG.gif and b/static/flags/BG.gif differ
diff --git a/static/flags/BH.gif b/static/flags/BH.gif
index 90c7f756..9ca2e37f 100644
Binary files a/static/flags/BH.gif and b/static/flags/BH.gif differ
diff --git a/static/flags/BK.gif b/static/flags/BK.gif
deleted file mode 100644
index c6d7f2ef..00000000
Binary files a/static/flags/BK.gif and /dev/null differ
diff --git a/static/flags/BL.gif b/static/flags/BL.gif
index 5bf4f05d..0c21d69a 100644
Binary files a/static/flags/BL.gif and b/static/flags/BL.gif differ
diff --git a/static/flags/BM.gif b/static/flags/BM.gif
index 041bd477..bda72207 100644
Binary files a/static/flags/BM.gif and b/static/flags/BM.gif differ
diff --git a/static/flags/BN.gif b/static/flags/BN.gif
index 6d590fbe..5714b453 100644
Binary files a/static/flags/BN.gif and b/static/flags/BN.gif differ
diff --git a/static/flags/BO.gif b/static/flags/BO.gif
index 92a3d5aa..4ada27cc 100644
Binary files a/static/flags/BO.gif and b/static/flags/BO.gif differ
diff --git a/static/flags/BP.gif b/static/flags/BP.gif
deleted file mode 100644
index 8e86d39a..00000000
Binary files a/static/flags/BP.gif and /dev/null differ
diff --git a/static/flags/BQ.gif b/static/flags/BQ.gif
index 99a4d901..5785c133 100644
Binary files a/static/flags/BQ.gif and b/static/flags/BQ.gif differ
diff --git a/static/flags/BR.gif b/static/flags/BR.gif
index 940432b2..8541dd02 100644
Binary files a/static/flags/BR.gif and b/static/flags/BR.gif differ
diff --git a/static/flags/BT.gif b/static/flags/BT.gif
index 7a98c558..57dc21c6 100644
Binary files a/static/flags/BT.gif and b/static/flags/BT.gif differ
diff --git a/static/flags/BU.gif b/static/flags/BU.gif
deleted file mode 100644
index 681c6c1a..00000000
Binary files a/static/flags/BU.gif and /dev/null differ
diff --git a/static/flags/BV.gif b/static/flags/BV.gif
index 3a47dfb2..b1117a7b 100644
Binary files a/static/flags/BV.gif and b/static/flags/BV.gif differ
diff --git a/static/flags/BX.gif b/static/flags/BX.gif
deleted file mode 100644
index 4a14cfb3..00000000
Binary files a/static/flags/BX.gif and /dev/null differ
diff --git a/static/flags/BY.gif b/static/flags/BY.gif
index 7c469ea6..6b7d8394 100644
Binary files a/static/flags/BY.gif and b/static/flags/BY.gif differ
diff --git a/static/flags/CA.gif b/static/flags/CA.gif
index f2391cd2..f7382a20 100644
Binary files a/static/flags/CA.gif and b/static/flags/CA.gif differ
diff --git a/static/flags/CB.gif b/static/flags/CB.gif
deleted file mode 100644
index eb8a45ad..00000000
Binary files a/static/flags/CB.gif and /dev/null differ
diff --git a/static/flags/CD.gif b/static/flags/CD.gif
index 245028e2..e786a5c1 100644
Binary files a/static/flags/CD.gif and b/static/flags/CD.gif differ
diff --git a/static/flags/CE.gif b/static/flags/CE.gif
deleted file mode 100644
index 30ccb5b4..00000000
Binary files a/static/flags/CE.gif and /dev/null differ
diff --git a/static/flags/CF.gif b/static/flags/CF.gif
index 11174ace..acdd287c 100644
Binary files a/static/flags/CF.gif and b/static/flags/CF.gif differ
diff --git a/static/flags/CG.gif b/static/flags/CG.gif
index a2eda541..e052941f 100644
Binary files a/static/flags/CG.gif and b/static/flags/CG.gif differ
diff --git a/static/flags/CH.gif b/static/flags/CH.gif
index b7219be7..8d02693f 100644
Binary files a/static/flags/CH.gif and b/static/flags/CH.gif differ
diff --git a/static/flags/CI.gif b/static/flags/CI.gif
index bd4af3a9..86ae6b31 100644
Binary files a/static/flags/CI.gif and b/static/flags/CI.gif differ
diff --git a/static/flags/CJ.gif b/static/flags/CJ.gif
deleted file mode 100644
index 16f0fded..00000000
Binary files a/static/flags/CJ.gif and /dev/null differ
diff --git a/static/flags/CK.gif b/static/flags/CK.gif
index 59ca2c01..8310438f 100644
Binary files a/static/flags/CK.gif and b/static/flags/CK.gif differ
diff --git a/static/flags/CM.gif b/static/flags/CM.gif
index 31af499a..8d0ebadf 100644
Binary files a/static/flags/CM.gif and b/static/flags/CM.gif differ
diff --git a/static/flags/CN.gif b/static/flags/CN.gif
index c67cc06f..b0dc412a 100644
Binary files a/static/flags/CN.gif and b/static/flags/CN.gif differ
diff --git a/static/flags/CO.gif b/static/flags/CO.gif
index cf91dbc4..b608cd6a 100644
Binary files a/static/flags/CO.gif and b/static/flags/CO.gif differ
diff --git a/static/flags/CQ.gif b/static/flags/CQ.gif
deleted file mode 100644
index a1347183..00000000
Binary files a/static/flags/CQ.gif and /dev/null differ
diff --git a/static/flags/CR.gif b/static/flags/CR.gif
index eb13f19d..1bc86250 100644
Binary files a/static/flags/CR.gif and b/static/flags/CR.gif differ
diff --git a/static/flags/CS.gif b/static/flags/CS.gif
deleted file mode 100644
index 5fec3bb1..00000000
Binary files a/static/flags/CS.gif and /dev/null differ
diff --git a/static/flags/CT.gif b/static/flags/CT.gif
deleted file mode 100644
index 8a148d0c..00000000
Binary files a/static/flags/CT.gif and /dev/null differ
diff --git a/static/flags/CU.gif b/static/flags/CU.gif
index 73d88b07..d514610c 100644
Binary files a/static/flags/CU.gif and b/static/flags/CU.gif differ
diff --git a/static/flags/CV.gif b/static/flags/CV.gif
index 6c6633c0..28023639 100644
Binary files a/static/flags/CV.gif and b/static/flags/CV.gif differ
diff --git a/static/flags/CW.gif b/static/flags/CW.gif
index 0f3b83ee..59617886 100644
Binary files a/static/flags/CW.gif and b/static/flags/CW.gif differ
diff --git a/static/flags/CY.gif b/static/flags/CY.gif
index eb0dbf85..8fb2da54 100644
Binary files a/static/flags/CY.gif and b/static/flags/CY.gif differ
diff --git a/static/flags/DA.gif b/static/flags/DA.gif
deleted file mode 100644
index 646fa3f9..00000000
Binary files a/static/flags/DA.gif and /dev/null differ
diff --git a/static/flags/DJ.gif b/static/flags/DJ.gif
index 53a9d4c8..d9f12158 100644
Binary files a/static/flags/DJ.gif and b/static/flags/DJ.gif differ
diff --git a/static/flags/DO.gif b/static/flags/DO.gif
index ce0b9dbe..952af49e 100644
Binary files a/static/flags/DO.gif and b/static/flags/DO.gif differ
diff --git a/static/flags/DR.gif b/static/flags/DR.gif
deleted file mode 100644
index c77e1652..00000000
Binary files a/static/flags/DR.gif and /dev/null differ
diff --git a/static/flags/DX.gif b/static/flags/DX.gif
deleted file mode 100644
index ee0252c5..00000000
Binary files a/static/flags/DX.gif and /dev/null differ
diff --git a/static/flags/EC.gif b/static/flags/EC.gif
index 5337fc51..fc3e2940 100644
Binary files a/static/flags/EC.gif and b/static/flags/EC.gif differ
diff --git a/static/flags/EE.gif b/static/flags/EE.gif
index 97c742b7..da4bd2b1 100644
Binary files a/static/flags/EE.gif and b/static/flags/EE.gif differ
diff --git a/static/flags/EG.gif b/static/flags/EG.gif
index 0b069404..c5448c82 100644
Binary files a/static/flags/EG.gif and b/static/flags/EG.gif differ
diff --git a/static/flags/EI.gif b/static/flags/EI.gif
deleted file mode 100644
index 53ce5afd..00000000
Binary files a/static/flags/EI.gif and /dev/null differ
diff --git a/static/flags/EK.gif b/static/flags/EK.gif
deleted file mode 100644
index 03c8577b..00000000
Binary files a/static/flags/EK.gif and /dev/null differ
diff --git a/static/flags/EN.gif b/static/flags/EN.gif
deleted file mode 100644
index 3fcad607..00000000
Binary files a/static/flags/EN.gif and /dev/null differ
diff --git a/static/flags/ER.gif b/static/flags/ER.gif
index 712bda75..266097f1 100644
Binary files a/static/flags/ER.gif and b/static/flags/ER.gif differ
diff --git a/static/flags/ES.gif b/static/flags/ES.gif
index 2e5e0120..9ef1912a 100644
Binary files a/static/flags/ES.gif and b/static/flags/ES.gif differ
diff --git a/static/flags/ET.gif b/static/flags/ET.gif
index 036f16fa..632a5fd8 100644
Binary files a/static/flags/ET.gif and b/static/flags/ET.gif differ
diff --git a/static/flags/EZ.gif b/static/flags/EZ.gif
deleted file mode 100644
index b2e9763a..00000000
Binary files a/static/flags/EZ.gif and /dev/null differ
diff --git a/static/flags/FI.gif b/static/flags/FI.gif
index 268207e8..888caf5b 100644
Binary files a/static/flags/FI.gif and b/static/flags/FI.gif differ
diff --git a/static/flags/FJ.gif b/static/flags/FJ.gif
index 175c6a15..531cdb97 100644
Binary files a/static/flags/FJ.gif and b/static/flags/FJ.gif differ
diff --git a/static/flags/FK.gif b/static/flags/FK.gif
index 12e5de30..3720fc4a 100644
Binary files a/static/flags/FK.gif and b/static/flags/FK.gif differ
diff --git a/static/flags/FM.gif b/static/flags/FM.gif
index 1fcaf2c6..49e72c05 100644
Binary files a/static/flags/FM.gif and b/static/flags/FM.gif differ
diff --git a/static/flags/FO.gif b/static/flags/FO.gif
index f7dae99a..ddafd369 100644
Binary files a/static/flags/FO.gif and b/static/flags/FO.gif differ
diff --git a/static/flags/FP.gif b/static/flags/FP.gif
deleted file mode 100644
index 49006b51..00000000
Binary files a/static/flags/FP.gif and /dev/null differ
diff --git a/static/flags/FR.gif b/static/flags/FR.gif
index c9ac8506..0c21d69a 100644
Binary files a/static/flags/FR.gif and b/static/flags/FR.gif differ
diff --git a/static/flags/FS.gif b/static/flags/FS.gif
deleted file mode 100644
index af6d849f..00000000
Binary files a/static/flags/FS.gif and /dev/null differ
diff --git a/static/flags/GA.gif b/static/flags/GA.gif
index 29a60442..757c1e68 100644
Binary files a/static/flags/GA.gif and b/static/flags/GA.gif differ
diff --git a/static/flags/GB.gif b/static/flags/GB.gif
index 9d171a6f..ccac6cc8 100644
Binary files a/static/flags/GB.gif and b/static/flags/GB.gif differ
diff --git a/static/flags/GG.gif b/static/flags/GG.gif
index b537bcd5..cf4b31c3 100644
Binary files a/static/flags/GG.gif and b/static/flags/GG.gif differ
diff --git a/static/flags/GH.gif b/static/flags/GH.gif
index 739ac028..d4da8e89 100644
Binary files a/static/flags/GH.gif and b/static/flags/GH.gif differ
diff --git a/static/flags/GI.gif b/static/flags/GI.gif
index c56a001b..9f90768f 100644
Binary files a/static/flags/GI.gif and b/static/flags/GI.gif differ
diff --git a/static/flags/GJ.gif b/static/flags/GJ.gif
deleted file mode 100644
index 9bab7922..00000000
Binary files a/static/flags/GJ.gif and /dev/null differ
diff --git a/static/flags/GK.gif b/static/flags/GK.gif
deleted file mode 100644
index aa762600..00000000
Binary files a/static/flags/GK.gif and /dev/null differ
diff --git a/static/flags/GL.gif b/static/flags/GL.gif
index e5dc211c..e9d93876 100644
Binary files a/static/flags/GL.gif and b/static/flags/GL.gif differ
diff --git a/static/flags/GM.gif b/static/flags/GM.gif
index 6d01d755..03ce1236 100644
Binary files a/static/flags/GM.gif and b/static/flags/GM.gif differ
diff --git a/static/flags/GQ.gif b/static/flags/GQ.gif
index 6c84c8f6..7525731e 100644
Binary files a/static/flags/GQ.gif and b/static/flags/GQ.gif differ
diff --git a/static/flags/GR.gif b/static/flags/GR.gif
index fc070fdb..7557345e 100644
Binary files a/static/flags/GR.gif and b/static/flags/GR.gif differ
diff --git a/static/flags/GT.gif b/static/flags/GT.gif
index 85a89dd4..066410d7 100644
Binary files a/static/flags/GT.gif and b/static/flags/GT.gif differ
diff --git a/static/flags/GV.gif b/static/flags/GV.gif
deleted file mode 100644
index 4426494c..00000000
Binary files a/static/flags/GV.gif and /dev/null differ
diff --git a/static/flags/GY.gif b/static/flags/GY.gif
index e94b5507..9f943e87 100644
Binary files a/static/flags/GY.gif and b/static/flags/GY.gif differ
diff --git a/static/flags/HA.gif b/static/flags/HA.gif
deleted file mode 100644
index c219a97d..00000000
Binary files a/static/flags/HA.gif and /dev/null differ
diff --git a/static/flags/HK.gif b/static/flags/HK.gif
index edf29d40..0c645609 100644
Binary files a/static/flags/HK.gif and b/static/flags/HK.gif differ
diff --git a/static/flags/HM.gif b/static/flags/HM.gif
index 9622e532..08945485 100644
Binary files a/static/flags/HM.gif and b/static/flags/HM.gif differ
diff --git a/static/flags/HO.gif b/static/flags/HO.gif
deleted file mode 100644
index dae527c6..00000000
Binary files a/static/flags/HO.gif and /dev/null differ
diff --git a/static/flags/HR.gif b/static/flags/HR.gif
index 875b2f6b..249d624a 100644
Binary files a/static/flags/HR.gif and b/static/flags/HR.gif differ
diff --git a/static/flags/HU.gif b/static/flags/HU.gif
index 752ce464..b7443f4f 100644
Binary files a/static/flags/HU.gif and b/static/flags/HU.gif differ
diff --git a/static/flags/IC.gif b/static/flags/IC.gif
deleted file mode 100644
index 7aaa70c6..00000000
Binary files a/static/flags/IC.gif and /dev/null differ
diff --git a/static/flags/ID.gif b/static/flags/ID.gif
index b260456a..b8aa2c85 100644
Binary files a/static/flags/ID.gif and b/static/flags/ID.gif differ
diff --git a/static/flags/IM.gif b/static/flags/IM.gif
index 998345de..cf719f78 100644
Binary files a/static/flags/IM.gif and b/static/flags/IM.gif differ
diff --git a/static/flags/IN.gif b/static/flags/IN.gif
index 6480d010..629f259f 100644
Binary files a/static/flags/IN.gif and b/static/flags/IN.gif differ
diff --git a/static/flags/IO.gif b/static/flags/IO.gif
index 944a97cb..1b7f551d 100644
Binary files a/static/flags/IO.gif and b/static/flags/IO.gif differ
diff --git a/static/flags/IP.gif b/static/flags/IP.gif
deleted file mode 100644
index c271eb8a..00000000
Binary files a/static/flags/IP.gif and /dev/null differ
diff --git a/static/flags/IR.gif b/static/flags/IR.gif
index 7c939554..089c0748 100644
Binary files a/static/flags/IR.gif and b/static/flags/IR.gif differ
diff --git a/static/flags/IT.gif b/static/flags/IT.gif
index 10caf592..cb6ece3a 100644
Binary files a/static/flags/IT.gif and b/static/flags/IT.gif differ
diff --git a/static/flags/IV.gif b/static/flags/IV.gif
deleted file mode 100644
index 121a055b..00000000
Binary files a/static/flags/IV.gif and /dev/null differ
diff --git a/static/flags/IZ.gif b/static/flags/IZ.gif
deleted file mode 100644
index 94d3f1e6..00000000
Binary files a/static/flags/IZ.gif and /dev/null differ
diff --git a/static/flags/JA.gif b/static/flags/JA.gif
deleted file mode 100644
index 2de4b487..00000000
Binary files a/static/flags/JA.gif and /dev/null differ
diff --git a/static/flags/JE.gif b/static/flags/JE.gif
index de32c0dd..e123ca53 100644
Binary files a/static/flags/JE.gif and b/static/flags/JE.gif differ
diff --git a/static/flags/JM.gif b/static/flags/JM.gif
index d9df73cb..9b35681d 100644
Binary files a/static/flags/JM.gif and b/static/flags/JM.gif differ
diff --git a/static/flags/JN.gif b/static/flags/JN.gif
deleted file mode 100644
index 587cafdd..00000000
Binary files a/static/flags/JN.gif and /dev/null differ
diff --git a/static/flags/JO.gif b/static/flags/JO.gif
index 66903bda..6dbba6a3 100644
Binary files a/static/flags/JO.gif and b/static/flags/JO.gif differ
diff --git a/static/flags/KE.gif b/static/flags/KE.gif
index efb1b2ea..523cab12 100644
Binary files a/static/flags/KE.gif and b/static/flags/KE.gif differ
diff --git a/static/flags/KG.gif b/static/flags/KG.gif
index 6190ce21..52e33496 100644
Binary files a/static/flags/KG.gif and b/static/flags/KG.gif differ
diff --git a/static/flags/KN.gif b/static/flags/KN.gif
index 92c104b1..9481c1a2 100644
Binary files a/static/flags/KN.gif and b/static/flags/KN.gif differ
diff --git a/static/flags/KR.gif b/static/flags/KR.gif
index 0551c691..28e1dfc4 100644
Binary files a/static/flags/KR.gif and b/static/flags/KR.gif differ
diff --git a/static/flags/KS.gif b/static/flags/KS.gif
deleted file mode 100644
index 39fc52c0..00000000
Binary files a/static/flags/KS.gif and /dev/null differ
diff --git a/static/flags/KT.gif b/static/flags/KT.gif
deleted file mode 100644
index cd540240..00000000
Binary files a/static/flags/KT.gif and /dev/null differ
diff --git a/static/flags/KU.gif b/static/flags/KU.gif
deleted file mode 100644
index dd30d20e..00000000
Binary files a/static/flags/KU.gif and /dev/null differ
diff --git a/static/flags/KV.gif b/static/flags/KV.gif
deleted file mode 100644
index 2bdc542e..00000000
Binary files a/static/flags/KV.gif and /dev/null differ
diff --git a/static/flags/KZ.gif b/static/flags/KZ.gif
index 9546b3a7..031238a4 100644
Binary files a/static/flags/KZ.gif and b/static/flags/KZ.gif differ
diff --git a/static/flags/LA.gif b/static/flags/LA.gif
index cdeda567..b08836b1 100644
Binary files a/static/flags/LA.gif and b/static/flags/LA.gif differ
diff --git a/static/flags/LE.gif b/static/flags/LE.gif
deleted file mode 100644
index 2c88298c..00000000
Binary files a/static/flags/LE.gif and /dev/null differ
diff --git a/static/flags/LG.gif b/static/flags/LG.gif
deleted file mode 100644
index 39be2676..00000000
Binary files a/static/flags/LG.gif and /dev/null differ
diff --git a/static/flags/LH.gif b/static/flags/LH.gif
deleted file mode 100644
index e602d43b..00000000
Binary files a/static/flags/LH.gif and /dev/null differ
diff --git a/static/flags/LI.gif b/static/flags/LI.gif
index beddd3e7..fde1cbac 100644
Binary files a/static/flags/LI.gif and b/static/flags/LI.gif differ
diff --git a/static/flags/LO.gif b/static/flags/LO.gif
deleted file mode 100644
index 80e1455b..00000000
Binary files a/static/flags/LO.gif and /dev/null differ
diff --git a/static/flags/LS.gif b/static/flags/LS.gif
index 7514d0e5..a7165734 100644
Binary files a/static/flags/LS.gif and b/static/flags/LS.gif differ
diff --git a/static/flags/LT.gif b/static/flags/LT.gif
index 18b6eb78..7a4dd43c 100644
Binary files a/static/flags/LT.gif and b/static/flags/LT.gif differ
diff --git a/static/flags/LU.gif b/static/flags/LU.gif
index 4f2e7d56..37c8c3d3 100644
Binary files a/static/flags/LU.gif and b/static/flags/LU.gif differ
diff --git a/static/flags/LY.gif b/static/flags/LY.gif
index 4a4f6678..1681b9fb 100644
Binary files a/static/flags/LY.gif and b/static/flags/LY.gif differ
diff --git a/static/flags/MA.gif b/static/flags/MA.gif
index 73d82598..3ad13827 100644
Binary files a/static/flags/MA.gif and b/static/flags/MA.gif differ
diff --git a/static/flags/MC.gif b/static/flags/MC.gif
index 9d072785..ad62e4ae 100644
Binary files a/static/flags/MC.gif and b/static/flags/MC.gif differ
diff --git a/static/flags/MD.gif b/static/flags/MD.gif
index ec8be54f..2791ec63 100644
Binary files a/static/flags/MD.gif and b/static/flags/MD.gif differ
diff --git a/static/flags/MG.gif b/static/flags/MG.gif
index d24b4108..98b61fda 100644
Binary files a/static/flags/MG.gif and b/static/flags/MG.gif differ
diff --git a/static/flags/MH.gif b/static/flags/MH.gif
index 88a70c23..ee2713ef 100644
Binary files a/static/flags/MH.gif and b/static/flags/MH.gif differ
diff --git a/static/flags/MI.gif b/static/flags/MI.gif
deleted file mode 100644
index b21c0854..00000000
Binary files a/static/flags/MI.gif and /dev/null differ
diff --git a/static/flags/MJ.gif b/static/flags/MJ.gif
deleted file mode 100644
index bdbdf2b9..00000000
Binary files a/static/flags/MJ.gif and /dev/null differ
diff --git a/static/flags/MK.gif b/static/flags/MK.gif
index 434dbe29..2a3e6ae3 100644
Binary files a/static/flags/MK.gif and b/static/flags/MK.gif differ
diff --git a/static/flags/ML.gif b/static/flags/ML.gif
index 401fa025..5c7f795a 100644
Binary files a/static/flags/ML.gif and b/static/flags/ML.gif differ
diff --git a/static/flags/MN.gif b/static/flags/MN.gif
index 8640cf74..979839cb 100644
Binary files a/static/flags/MN.gif and b/static/flags/MN.gif differ
diff --git a/static/flags/MO.gif b/static/flags/MO.gif
index 5589cb4e..96669903 100644
Binary files a/static/flags/MO.gif and b/static/flags/MO.gif differ
diff --git a/static/flags/MP.gif b/static/flags/MP.gif
index 69e1025f..4f1dadcc 100644
Binary files a/static/flags/MP.gif and b/static/flags/MP.gif differ
diff --git a/static/flags/MR.gif b/static/flags/MR.gif
index 3b27a97c..b64c0972 100644
Binary files a/static/flags/MR.gif and b/static/flags/MR.gif differ
diff --git a/static/flags/MT.gif b/static/flags/MT.gif
index 3e69fce6..0d9e3f5c 100644
Binary files a/static/flags/MT.gif and b/static/flags/MT.gif differ
diff --git a/static/flags/MU.gif b/static/flags/MU.gif
index b72eb231..b49ef755 100644
Binary files a/static/flags/MU.gif and b/static/flags/MU.gif differ
diff --git a/static/flags/MV.gif b/static/flags/MV.gif
index e69a1f3f..27aaaa49 100644
Binary files a/static/flags/MV.gif and b/static/flags/MV.gif differ
diff --git a/static/flags/MX.gif b/static/flags/MX.gif
index dec6bdb5..530bddbf 100644
Binary files a/static/flags/MX.gif and b/static/flags/MX.gif differ
diff --git a/static/flags/MY.gif b/static/flags/MY.gif
index 4c89f94d..592ae1a0 100644
Binary files a/static/flags/MY.gif and b/static/flags/MY.gif differ
diff --git a/static/flags/MZ.gif b/static/flags/MZ.gif
index 739577ac..06718ac9 100644
Binary files a/static/flags/MZ.gif and b/static/flags/MZ.gif differ
diff --git a/static/flags/NC.gif b/static/flags/NC.gif
index 28564767..4f722415 100644
Binary files a/static/flags/NC.gif and b/static/flags/NC.gif differ
diff --git a/static/flags/NE.gif b/static/flags/NE.gif
index d2b7eda9..fd4c076a 100644
Binary files a/static/flags/NE.gif and b/static/flags/NE.gif differ
diff --git a/static/flags/NF.gif b/static/flags/NF.gif
index 11520be9..513de42f 100644
Binary files a/static/flags/NF.gif and b/static/flags/NF.gif differ
diff --git a/static/flags/NG.gif b/static/flags/NG.gif
index 20c4c158..befcd68e 100644
Binary files a/static/flags/NG.gif and b/static/flags/NG.gif differ
diff --git a/static/flags/NH.gif b/static/flags/NH.gif
deleted file mode 100644
index f5e76fc6..00000000
Binary files a/static/flags/NH.gif and /dev/null differ
diff --git a/static/flags/NI.gif b/static/flags/NI.gif
index 41a7ead6..b6fdd5f8 100644
Binary files a/static/flags/NI.gif and b/static/flags/NI.gif differ
diff --git a/static/flags/NL.gif b/static/flags/NL.gif
index 49e1e3a3..a68ceae0 100644
Binary files a/static/flags/NL.gif and b/static/flags/NL.gif differ
diff --git a/static/flags/NN.gif b/static/flags/NN.gif
deleted file mode 100644
index d1cb60c2..00000000
Binary files a/static/flags/NN.gif and /dev/null differ
diff --git a/static/flags/NO.gif b/static/flags/NO.gif
index a41e0cba..b1117a7b 100644
Binary files a/static/flags/NO.gif and b/static/flags/NO.gif differ
diff --git a/static/flags/NP.gif b/static/flags/NP.gif
index 9591956b..d7176ab2 100644
Binary files a/static/flags/NP.gif and b/static/flags/NP.gif differ
diff --git a/static/flags/NR.gif b/static/flags/NR.gif
index 1068a18d..9e68a63f 100644
Binary files a/static/flags/NR.gif and b/static/flags/NR.gif differ
diff --git a/static/flags/NS.gif b/static/flags/NS.gif
deleted file mode 100644
index cfc6156b..00000000
Binary files a/static/flags/NS.gif and /dev/null differ
diff --git a/static/flags/NU.gif b/static/flags/NU.gif
index 28d3c95a..e2e52fe9 100644
Binary files a/static/flags/NU.gif and b/static/flags/NU.gif differ
diff --git a/static/flags/NZ.gif b/static/flags/NZ.gif
index 77c9afbf..33873363 100644
Binary files a/static/flags/NZ.gif and b/static/flags/NZ.gif differ
diff --git a/static/flags/OD.gif b/static/flags/OD.gif
deleted file mode 100644
index 78c803af..00000000
Binary files a/static/flags/OD.gif and /dev/null differ
diff --git a/static/flags/PA.gif b/static/flags/PA.gif
index 1fac8aa7..73fed1f9 100644
Binary files a/static/flags/PA.gif and b/static/flags/PA.gif differ
diff --git a/static/flags/PC.gif b/static/flags/PC.gif
deleted file mode 100644
index 2c5731c0..00000000
Binary files a/static/flags/PC.gif and /dev/null differ
diff --git a/static/flags/PE.gif b/static/flags/PE.gif
index bc98826e..4dc735a1 100644
Binary files a/static/flags/PE.gif and b/static/flags/PE.gif differ
diff --git a/static/flags/PK.gif b/static/flags/PK.gif
index 76894682..8208abb0 100644
Binary files a/static/flags/PK.gif and b/static/flags/PK.gif differ
diff --git a/static/flags/PL.gif b/static/flags/PL.gif
index 397152a5..40146454 100644
Binary files a/static/flags/PL.gif and b/static/flags/PL.gif differ
diff --git a/static/flags/PM.gif b/static/flags/PM.gif
index d3929cac..abf703b4 100644
Binary files a/static/flags/PM.gif and b/static/flags/PM.gif differ
diff --git a/static/flags/PO.gif b/static/flags/PO.gif
deleted file mode 100644
index 63bc2d4b..00000000
Binary files a/static/flags/PO.gif and /dev/null differ
diff --git a/static/flags/PP.gif b/static/flags/PP.gif
deleted file mode 100644
index 0cd6ee06..00000000
Binary files a/static/flags/PP.gif and /dev/null differ
diff --git a/static/flags/PS.gif b/static/flags/PS.gif
index 5b876910..15259371 100644
Binary files a/static/flags/PS.gif and b/static/flags/PS.gif differ
diff --git a/static/flags/PU.gif b/static/flags/PU.gif
deleted file mode 100644
index 366ffe2d..00000000
Binary files a/static/flags/PU.gif and /dev/null differ
diff --git a/static/flags/QA.gif b/static/flags/QA.gif
index 9be229fc..d354ac1d 100644
Binary files a/static/flags/QA.gif and b/static/flags/QA.gif differ
diff --git a/static/flags/RI.gif b/static/flags/RI.gif
deleted file mode 100644
index 7549f69d..00000000
Binary files a/static/flags/RI.gif and /dev/null differ
diff --git a/static/flags/RM.gif b/static/flags/RM.gif
deleted file mode 100644
index 7c6178fe..00000000
Binary files a/static/flags/RM.gif and /dev/null differ
diff --git a/static/flags/RN.gif b/static/flags/RN.gif
deleted file mode 100644
index 078ce526..00000000
Binary files a/static/flags/RN.gif and /dev/null differ
diff --git a/static/flags/RO.gif b/static/flags/RO.gif
index f119b35b..20c8ab8b 100644
Binary files a/static/flags/RO.gif and b/static/flags/RO.gif differ
diff --git a/static/flags/RP.gif b/static/flags/RP.gif
deleted file mode 100644
index 64309d12..00000000
Binary files a/static/flags/RP.gif and /dev/null differ
diff --git a/static/flags/RQ.gif b/static/flags/RQ.gif
deleted file mode 100644
index a5c95751..00000000
Binary files a/static/flags/RQ.gif and /dev/null differ
diff --git a/static/flags/RS.gif b/static/flags/RS.gif
index b2380ec4..4787f84b 100644
Binary files a/static/flags/RS.gif and b/static/flags/RS.gif differ
diff --git a/static/flags/RW.gif b/static/flags/RW.gif
index dd038bf4..34554f3b 100644
Binary files a/static/flags/RW.gif and b/static/flags/RW.gif differ
diff --git a/static/flags/SA.gif b/static/flags/SA.gif
index c73987ef..c003d8e8 100644
Binary files a/static/flags/SA.gif and b/static/flags/SA.gif differ
diff --git a/static/flags/SB.gif b/static/flags/SB.gif
index faaee253..901f6ce6 100644
Binary files a/static/flags/SB.gif and b/static/flags/SB.gif differ
diff --git a/static/flags/SC.gif b/static/flags/SC.gif
index fcce7df0..1d6234bc 100644
Binary files a/static/flags/SC.gif and b/static/flags/SC.gif differ
diff --git a/static/flags/SE.gif b/static/flags/SE.gif
index 9656b236..bbbef8ec 100644
Binary files a/static/flags/SE.gif and b/static/flags/SE.gif differ
diff --git a/static/flags/SF.gif b/static/flags/SF.gif
deleted file mode 100644
index f83f703a..00000000
Binary files a/static/flags/SF.gif and /dev/null differ
diff --git a/static/flags/SG.gif b/static/flags/SG.gif
index 90b8b757..8fe1d06d 100644
Binary files a/static/flags/SG.gif and b/static/flags/SG.gif differ
diff --git a/static/flags/SH.gif b/static/flags/SH.gif
index d228f3be..73feb36a 100644
Binary files a/static/flags/SH.gif and b/static/flags/SH.gif differ
diff --git a/static/flags/SI.gif b/static/flags/SI.gif
index 98949b16..0fbfdce7 100644
Binary files a/static/flags/SI.gif and b/static/flags/SI.gif differ
diff --git a/static/flags/SL.gif b/static/flags/SL.gif
index 0fd12aa0..d3bec52a 100644
Binary files a/static/flags/SL.gif and b/static/flags/SL.gif differ
diff --git a/static/flags/SM.gif b/static/flags/SM.gif
index 24a233f0..fe10e454 100644
Binary files a/static/flags/SM.gif and b/static/flags/SM.gif differ
diff --git a/static/flags/SN.gif b/static/flags/SN.gif
index 5e192745..85816f4c 100644
Binary files a/static/flags/SN.gif and b/static/flags/SN.gif differ
diff --git a/static/flags/SO.gif b/static/flags/SO.gif
index 012871b9..65f5d9e3 100644
Binary files a/static/flags/SO.gif and b/static/flags/SO.gif differ
diff --git a/static/flags/SP.gif b/static/flags/SP.gif
deleted file mode 100644
index 7cf2cb7c..00000000
Binary files a/static/flags/SP.gif and /dev/null differ
diff --git a/static/flags/ST.gif b/static/flags/ST.gif
index a2c4e593..204c87e5 100644
Binary files a/static/flags/ST.gif and b/static/flags/ST.gif differ
diff --git a/static/flags/SU.gif b/static/flags/SU.gif
deleted file mode 100644
index dbbc7bf0..00000000
Binary files a/static/flags/SU.gif and /dev/null differ
diff --git a/static/flags/SV.gif b/static/flags/SV.gif
index 3788bc4e..1c94d770 100644
Binary files a/static/flags/SV.gif and b/static/flags/SV.gif differ
diff --git a/static/flags/SW.gif b/static/flags/SW.gif
deleted file mode 100644
index 4fdb247a..00000000
Binary files a/static/flags/SW.gif and /dev/null differ
diff --git a/static/flags/SX.gif b/static/flags/SX.gif
index 8db3abe2..04509033 100644
Binary files a/static/flags/SX.gif and b/static/flags/SX.gif differ
diff --git a/static/flags/SY.gif b/static/flags/SY.gif
index ecba9bfb..beca7be2 100644
Binary files a/static/flags/SY.gif and b/static/flags/SY.gif differ
diff --git a/static/flags/SZ.gif b/static/flags/SZ.gif
index ea21a6b1..e296e9b0 100644
Binary files a/static/flags/SZ.gif and b/static/flags/SZ.gif differ
diff --git a/static/flags/TB.gif b/static/flags/TB.gif
deleted file mode 100644
index a165d9e4..00000000
Binary files a/static/flags/TB.gif and /dev/null differ
diff --git a/static/flags/TD.gif b/static/flags/TD.gif
index 7d578a0b..481ffd69 100644
Binary files a/static/flags/TD.gif and b/static/flags/TD.gif differ
diff --git a/static/flags/TH.gif b/static/flags/TH.gif
index 55813891..79acb27f 100644
Binary files a/static/flags/TH.gif and b/static/flags/TH.gif differ
diff --git a/static/flags/TI.gif b/static/flags/TI.gif
deleted file mode 100644
index a2d1403c..00000000
Binary files a/static/flags/TI.gif and /dev/null differ
diff --git a/static/flags/TK.gif b/static/flags/TK.gif
index 0bfb031b..0015642f 100644
Binary files a/static/flags/TK.gif and b/static/flags/TK.gif differ
diff --git a/static/flags/TL.gif b/static/flags/TL.gif
index d59697ba..534387a5 100644
Binary files a/static/flags/TL.gif and b/static/flags/TL.gif differ
diff --git a/static/flags/TN.gif b/static/flags/TN.gif
index 4e1f69bd..af89d2d1 100644
Binary files a/static/flags/TN.gif and b/static/flags/TN.gif differ
diff --git a/static/flags/TO.gif b/static/flags/TO.gif
index 847a085d..6eb0c413 100644
Binary files a/static/flags/TO.gif and b/static/flags/TO.gif differ
diff --git a/static/flags/TP.gif b/static/flags/TP.gif
deleted file mode 100644
index 3d3f2936..00000000
Binary files a/static/flags/TP.gif and /dev/null differ
diff --git a/static/flags/TS.gif b/static/flags/TS.gif
deleted file mode 100644
index b09a9589..00000000
Binary files a/static/flags/TS.gif and /dev/null differ
diff --git a/static/flags/TT.gif b/static/flags/TT.gif
index 8627e3b0..702e5008 100644
Binary files a/static/flags/TT.gif and b/static/flags/TT.gif differ
diff --git a/static/flags/TU.gif b/static/flags/TU.gif
deleted file mode 100644
index 1033c1cf..00000000
Binary files a/static/flags/TU.gif and /dev/null differ
diff --git a/static/flags/TV.gif b/static/flags/TV.gif
index c5636e4f..206e7aad 100644
Binary files a/static/flags/TV.gif and b/static/flags/TV.gif differ
diff --git a/static/flags/TW.gif b/static/flags/TW.gif
index 346a4fc4..a5501c70 100644
Binary files a/static/flags/TW.gif and b/static/flags/TW.gif differ
diff --git a/static/flags/TX.gif b/static/flags/TX.gif
deleted file mode 100644
index f577c4fa..00000000
Binary files a/static/flags/TX.gif and /dev/null differ
diff --git a/static/flags/TZ.gif b/static/flags/TZ.gif
index 5619e72f..6bbd1d3c 100644
Binary files a/static/flags/TZ.gif and b/static/flags/TZ.gif differ
diff --git a/static/flags/UC.gif b/static/flags/UC.gif
deleted file mode 100644
index b675e991..00000000
Binary files a/static/flags/UC.gif and /dev/null differ
diff --git a/static/flags/UG.gif b/static/flags/UG.gif
index daa2888b..8bc1e3da 100644
Binary files a/static/flags/UG.gif and b/static/flags/UG.gif differ
diff --git a/static/flags/UK.gif b/static/flags/UK.gif
deleted file mode 100644
index 17b15b75..00000000
Binary files a/static/flags/UK.gif and /dev/null differ
diff --git a/static/flags/UM.gif b/static/flags/UM.gif
index 7269199a..10542cd6 100644
Binary files a/static/flags/UM.gif and b/static/flags/UM.gif differ
diff --git a/static/flags/UP.gif b/static/flags/UP.gif
deleted file mode 100644
index 0a3a3610..00000000
Binary files a/static/flags/UP.gif and /dev/null differ
diff --git a/static/flags/US.gif b/static/flags/US.gif
index 12a78a83..f54c9ce2 100644
Binary files a/static/flags/US.gif and b/static/flags/US.gif differ
diff --git a/static/flags/UV.gif b/static/flags/UV.gif
deleted file mode 100644
index e7b376be..00000000
Binary files a/static/flags/UV.gif and /dev/null differ
diff --git a/static/flags/UY.gif b/static/flags/UY.gif
index 31c81fdb..7c468371 100644
Binary files a/static/flags/UY.gif and b/static/flags/UY.gif differ
diff --git a/static/flags/UZ.gif b/static/flags/UZ.gif
index 00426418..81a95502 100644
Binary files a/static/flags/UZ.gif and b/static/flags/UZ.gif differ
diff --git a/static/flags/VC.gif b/static/flags/VC.gif
index 3050029f..3dd57939 100644
Binary files a/static/flags/VC.gif and b/static/flags/VC.gif differ
diff --git a/static/flags/VE.gif b/static/flags/VE.gif
index f4f2bb0b..6d4efcb1 100644
Binary files a/static/flags/VE.gif and b/static/flags/VE.gif differ
diff --git a/static/flags/VI.gif b/static/flags/VI.gif
index fd91d6c4..133cffd3 100644
Binary files a/static/flags/VI.gif and b/static/flags/VI.gif differ
diff --git a/static/flags/VM.gif b/static/flags/VM.gif
deleted file mode 100644
index d14403a5..00000000
Binary files a/static/flags/VM.gif and /dev/null differ
diff --git a/static/flags/VQ.gif b/static/flags/VQ.gif
deleted file mode 100644
index 34ce601d..00000000
Binary files a/static/flags/VQ.gif and /dev/null differ
diff --git a/static/flags/VT.gif b/static/flags/VT.gif
deleted file mode 100644
index e2be0237..00000000
Binary files a/static/flags/VT.gif and /dev/null differ
diff --git a/static/flags/WA.gif b/static/flags/WA.gif
deleted file mode 100644
index fb0661e2..00000000
Binary files a/static/flags/WA.gif and /dev/null differ
diff --git a/static/flags/WF.gif b/static/flags/WF.gif
index bdfe3563..6baeec2f 100644
Binary files a/static/flags/WF.gif and b/static/flags/WF.gif differ
diff --git a/static/flags/WQ.gif b/static/flags/WQ.gif
deleted file mode 100644
index 80daab2b..00000000
Binary files a/static/flags/WQ.gif and /dev/null differ
diff --git a/static/flags/WS.gif b/static/flags/WS.gif
index 9bd05dda..d5a83da8 100644
Binary files a/static/flags/WS.gif and b/static/flags/WS.gif differ
diff --git a/static/flags/WZ.gif b/static/flags/WZ.gif
deleted file mode 100644
index 6f486d74..00000000
Binary files a/static/flags/WZ.gif and /dev/null differ
diff --git a/static/flags/YM.gif b/static/flags/YM.gif
deleted file mode 100644
index 485c12ac..00000000
Binary files a/static/flags/YM.gif and /dev/null differ
diff --git a/static/flags/ZA.gif b/static/flags/ZA.gif
index 54e7652c..f7b505e4 100644
Binary files a/static/flags/ZA.gif and b/static/flags/ZA.gif differ
diff --git a/static/flags/ZI.gif b/static/flags/ZI.gif
deleted file mode 100644
index 71aae712..00000000
Binary files a/static/flags/ZI.gif and /dev/null differ
diff --git a/static/flags/__.gif b/static/flags/__.gif
new file mode 100644
index 00000000..fe7f93b8
Binary files /dev/null and b/static/flags/__.gif differ
diff --git a/static/flags/ad.gif b/static/flags/ad.gif
new file mode 100644
index 00000000..830b29b0
Binary files /dev/null and b/static/flags/ad.gif differ
diff --git a/static/flags/ai.gif b/static/flags/ai.gif
new file mode 100644
index 00000000..0929974a
Binary files /dev/null and b/static/flags/ai.gif differ
diff --git a/static/flags/aw.gif b/static/flags/aw.gif
new file mode 100644
index 00000000..54259c07
Binary files /dev/null and b/static/flags/aw.gif differ
diff --git a/static/flags/az.gif b/static/flags/az.gif
new file mode 100644
index 00000000..c0374918
Binary files /dev/null and b/static/flags/az.gif differ
diff --git a/static/flags/bi.gif b/static/flags/bi.gif
new file mode 100644
index 00000000..bb259603
Binary files /dev/null and b/static/flags/bi.gif differ
diff --git a/static/flags/bj.gif b/static/flags/bj.gif
new file mode 100644
index 00000000..f4d7fc35
Binary files /dev/null and b/static/flags/bj.gif differ
diff --git a/static/flags/bs.gif b/static/flags/bs.gif
new file mode 100644
index 00000000..6eadd88d
Binary files /dev/null and b/static/flags/bs.gif differ
diff --git a/static/flags/bw.gif b/static/flags/bw.gif
new file mode 100644
index 00000000..3af6339f
Binary files /dev/null and b/static/flags/bw.gif differ
diff --git a/static/flags/bz.gif b/static/flags/bz.gif
new file mode 100644
index 00000000..7b3fd388
Binary files /dev/null and b/static/flags/bz.gif differ
diff --git a/static/flags/cc.gif b/static/flags/cc.gif
new file mode 100644
index 00000000..d602aac3
Binary files /dev/null and b/static/flags/cc.gif differ
diff --git a/static/flags/cl.gif b/static/flags/cl.gif
new file mode 100644
index 00000000..68dcdd5a
Binary files /dev/null and b/static/flags/cl.gif differ
diff --git a/static/flags/cx.gif b/static/flags/cx.gif
new file mode 100644
index 00000000..86ffb71e
Binary files /dev/null and b/static/flags/cx.gif differ
diff --git a/static/flags/cz.gif b/static/flags/cz.gif
new file mode 100644
index 00000000..64348244
Binary files /dev/null and b/static/flags/cz.gif differ
diff --git a/static/flags/de.gif b/static/flags/de.gif
new file mode 100644
index 00000000..e5fdfaa9
Binary files /dev/null and b/static/flags/de.gif differ
diff --git a/static/flags/dk.gif b/static/flags/dk.gif
new file mode 100644
index 00000000..39c87825
Binary files /dev/null and b/static/flags/dk.gif differ
diff --git a/static/flags/dm.gif b/static/flags/dm.gif
new file mode 100644
index 00000000..927bbe51
Binary files /dev/null and b/static/flags/dm.gif differ
diff --git a/static/flags/dz.gif b/static/flags/dz.gif
new file mode 100644
index 00000000..71933a96
Binary files /dev/null and b/static/flags/dz.gif differ
diff --git a/static/flags/eh.gif b/static/flags/eh.gif
new file mode 100644
index 00000000..7d2b276c
Binary files /dev/null and b/static/flags/eh.gif differ
diff --git a/static/flags/eu.gif b/static/flags/eu.gif
new file mode 100644
index 00000000..2a4e71ad
Binary files /dev/null and b/static/flags/eu.gif differ
diff --git a/static/flags/flags.rtf b/static/flags/flags.rtf
deleted file mode 100644
index 07181fce..00000000
--- a/static/flags/flags.rtf
+++ /dev/null
@@ -1,256 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf2821
-\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww27940\viewh17020\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural\partightenfactor0
-
-\f0\fs96 \cf0 \
-AF, Afghanistan,\
-AL, Albania,\
-DZ, Algeria\
-AS, American Samoa\
-AD, Andorra\
-AO, Angola \
-AI, Anguilla\
-AQ, Antarctica\
-AG, Antigua and Barbuda\
-AR, Argentina\
-AM, Armenia\
-AW, Aruba\
-AU, Australia\
-AT, Austria\
-AZ, Azerbaijan\
-BS, Bahamas\
-BH, Bahrain\
-BD, Bangladesh\
-BB, Barbados\
-BY, Belarus\
-BE, Belgium\
-BZ, Belize\
-BJ, Benin\
-BM, Bermuda\
-BT, Bhutan\
-BO, Bolivia\
-BQ, Bonaire, Sint Eustatius and Saba\
-BA, Bosnia and Herzegovina\
-BW, Botswana\
-BV, Bouvet Island\
-BR, Brazil\
-IO, British Indian Ocean Territory\
-BN, Brunei\
-BG, Bulgaria\
-BF, Burkina Faso\
-BI, Burundi\
-CV, Cabo Verde\
-KH, Cambodia\
-CM, Cameroon\
-CA, Canada\
-KY, Cayman Islands\
-CF, Central African Republic\
-TD, Chad\
-CL, Chile\
-CN, China\
-CX, Christmas Island\
-CC, Cocos (Keeling) Islands\
-CO, Colombia\
-KM, Comoros\
-CG, Congo\
-CD, Congo (the Democratic Republic of the)\
-CK, Cook Islands\
-CR, Costa Rica\
-CI, C\'f4te d'Ivoire\
-HR, Croatia\
-CU, Cuba\
-CW, Cura\'e7ao\
-CY, Cyprus\
-CZ, Czechia\
-DK, Denmark\
-DJ, Djibouti\
-DM, Dominica\
-DO, Dominican Republic\
-EC, Ecuador\
-EG, Egypt\
-SV, El Salvador\
-GQ, Equatorial Guinea\
-ER, Eritrea\
-EE, Estonia\
-SZ, Eswatini\
-ET, Ethiopia\
-FK, Falkland Islands (Malvinas)\
-FO, Faroe Islands\
-FJ, Fiji\
-FI, Finland\
-FR, France\
-GF, French Guiana\
-PF, French Polynesia\
-TF, French Southern Territories\
-GA, Gabon\
-GM, Gambia\
-GE, Georgia\
-DE, Germany\
-GH, Ghana\
-GI, Gibraltar\
-GR, Greece\
-GL, Greenland\
-GD, Grenada\
-GP, Guadeloupe\
-GU, Guam\
-GT, Guatemala\
-GG, Guernsey\
-GN, Guinea\
-GW, Guinea-Bissau\
-GY, Guyana\
-HT, Haiti\
-HM, Heard Island and McDonald Islands\
-VA, Holy See\
-HN, Honduras\
-HK, Hong Kong\
-HU, Hungary\
-IS, Iceland\
-IN, India\
-ID, Indonesia\
-IR, Iran\
-IQ, Iraq\
-IE, Ireland\
-IM, Isle of Man\
-IL, Israel\
-IT, Italy\
-JM, Jamaica\
-JP, Japan\
-JE, Jersey\
-JO, Jordan\
-KZ, Kazakhstan\
-KE, Kenya\
-KI, Kiribati\
-KW, Kuwait\
-KG, Kyrgyzstan\
-LA, Laos\
-LV, Latvia\
-LB, Lebanon\
-LS, Lesotho\
-LR, Liberia\
-LY, Libya\
-LI, Liechtenstein\
-LT, Lithuania\
-LU, Luxembourg\
-MO, Macao\
-MG, Madagascar\
-MW, Malawi\
-MY, Malaysia\
-MV, Maldives\
-ML, Mali\
-MT, Malta\
-MH, Marshall Islands\
-MQ, Martinique\
-MR, Mauritania\
-MU, Mauritius\
-YT, Mayotte\
-MX, Mexico\
-FM, Micronesia\
-MD, Moldova\
-MC, Monaco\
-MN, Mongolia\
-ME, Montenegro\
-MS, Montserrat\
-MA, Morocco\
-MZ, Mozambique\
-MM, Myanmar\
-NA, Namibia\
-NR, Nauru\
-NP, Nepal\
-NL, Netherlands\
-NC, New Caledonia\
-NZ, New Zealand\
-NI, Nicaragua\
-NE, Niger\
-NG, Nigeria\
-NU, Niue\
-NF, Norfolk Island\
-KP, North Korea\
-MK, North Macedonia\
-MP, Northern Mariana Islands\
-NO, Norway\
-OM, Oman\
-PK, Pakistan\
-PW, Palau\
-PS, Palestine\
-PA, Panama\
-PG, Papua New Guinea\
-PY, Paraguay\
-PE, Peru\
-PH, Philippines\
-PN, Pitcairn\
-PL, Poland\
-PT, Portugal\
-PR, Puerto Rico\
-QA, Qatar\
-RE, R\'e9union\
-RO, Romania\
-RU, Russia\
-RW, Rwanda\
-BL, Saint Barth\'e9lemy\
-SH, Saint Helena, Ascension and Tristan da Cunha\
-KN, Saint Kitts and Nevis\
-LC, Saint Lucia\
-MF, Saint Martin (French part)\
-PM, Saint Pierre and Miquelon\
-VC, Saint Vincent and the Grenadines\
-WS, Samoa\
-SM, San Marino\
-ST, Sao Tome and Principe\
-SA, Saudi Arabia\
-SN, Senegal\
-RS, Serbia\
-SC, Seychelles\
-SL, Sierra Leone\
-SG, Singapore\
-SX, Sint Maarten\
-SK, Slovakia\
-SI, Slovenia\
-SB, Solomon Islands\
-SO, Somalia\
-ZA, South Africa\
-GS, South Georgia and the South Sandwich Islands\
-KR, South Korea\
-SS, South Sudan\
-ES, Spain\
-LK, Sri Lanka\
-SD, Sudan\
-SR, Suriname\
-SJ, Svalbard and Jan Mayen\
-SE, Sweden\
-CH, Switzerland\
-SY, Syria\
-TW, Taiwan\
-TJ, Tajikistan\
-TZ, Tanzania\
-TH, Thailand\
-TL, Timor-Leste\
-TG, Togo\
-TK, Tokelau\
-TO, Tonga\
-TT, Trinidad and Tobago\
-TN, Tunisia\
-TR, T\'fcrkiye\
-TM, Turkmenistan\
-TC, Turks and Caicos Islands\
-TV, Tuvalu\
-UG, Uganda\
-UA, Ukraine\
-AE, United Arab Emirates\
-GB, United Kingdom\
-UM, United States Minor Outlying Islands\
-US, United States of America\
-UY, Uruguay\
-UZ, Uzbekistan\
-VU, Vanuatu\
-VE, Venezuela\
-VN, Vietnam\
-VG, Virgin Islands (British)\
-VI, Virgin Islands (U.S.)\
-WF, Wallis and Futuna\
-EH, Western Sahara\
-YE, Yemen\
-ZM, Zambia\
-ZW, Zimbabwe}
\ No newline at end of file
diff --git a/static/flags/gd.gif b/static/flags/gd.gif
new file mode 100644
index 00000000..1f0c15b1
Binary files /dev/null and b/static/flags/gd.gif differ
diff --git a/static/flags/ge.gif b/static/flags/ge.gif
new file mode 100644
index 00000000..aa80145f
Binary files /dev/null and b/static/flags/ge.gif differ
diff --git a/static/flags/gf.gif b/static/flags/gf.gif
new file mode 100644
index 00000000..0c21d69a
Binary files /dev/null and b/static/flags/gf.gif differ
diff --git a/static/flags/gn.gif b/static/flags/gn.gif
new file mode 100644
index 00000000..a27b7562
Binary files /dev/null and b/static/flags/gn.gif differ
diff --git a/static/flags/gp.gif b/static/flags/gp.gif
new file mode 100644
index 00000000..b2271992
Binary files /dev/null and b/static/flags/gp.gif differ
diff --git a/static/flags/gs.gif b/static/flags/gs.gif
new file mode 100644
index 00000000..83234c4a
Binary files /dev/null and b/static/flags/gs.gif differ
diff --git a/static/flags/gu.gif b/static/flags/gu.gif
new file mode 100644
index 00000000..313c2604
Binary files /dev/null and b/static/flags/gu.gif differ
diff --git a/static/flags/gw.gif b/static/flags/gw.gif
new file mode 100644
index 00000000..8ce3001e
Binary files /dev/null and b/static/flags/gw.gif differ
diff --git a/static/flags/hn.gif b/static/flags/hn.gif
new file mode 100644
index 00000000..75c8f4ea
Binary files /dev/null and b/static/flags/hn.gif differ
diff --git a/static/flags/ht.gif b/static/flags/ht.gif
new file mode 100644
index 00000000..32917747
Binary files /dev/null and b/static/flags/ht.gif differ
diff --git a/static/flags/ie.gif b/static/flags/ie.gif
new file mode 100644
index 00000000..4f0937cb
Binary files /dev/null and b/static/flags/ie.gif differ
diff --git a/static/flags/il.gif b/static/flags/il.gif
new file mode 100644
index 00000000..d774c134
Binary files /dev/null and b/static/flags/il.gif differ
diff --git a/static/flags/iq.gif b/static/flags/iq.gif
new file mode 100644
index 00000000..580c8d52
Binary files /dev/null and b/static/flags/iq.gif differ
diff --git a/static/flags/is.gif b/static/flags/is.gif
new file mode 100644
index 00000000..046c1dcf
Binary files /dev/null and b/static/flags/is.gif differ
diff --git a/static/flags/jp.gif b/static/flags/jp.gif
new file mode 100644
index 00000000..834e8afb
Binary files /dev/null and b/static/flags/jp.gif differ
diff --git a/static/flags/kh.gif b/static/flags/kh.gif
new file mode 100644
index 00000000..b16bf77f
Binary files /dev/null and b/static/flags/kh.gif differ
diff --git a/static/flags/ki.gif b/static/flags/ki.gif
new file mode 100644
index 00000000..69cd34a2
Binary files /dev/null and b/static/flags/ki.gif differ
diff --git a/static/flags/km.gif b/static/flags/km.gif
new file mode 100644
index 00000000..8a9fce53
Binary files /dev/null and b/static/flags/km.gif differ
diff --git a/static/flags/kp.gif b/static/flags/kp.gif
new file mode 100644
index 00000000..fee280b7
Binary files /dev/null and b/static/flags/kp.gif differ
diff --git a/static/flags/kw.gif b/static/flags/kw.gif
new file mode 100644
index 00000000..fa3ee09c
Binary files /dev/null and b/static/flags/kw.gif differ
diff --git a/static/flags/ky.gif b/static/flags/ky.gif
new file mode 100644
index 00000000..2cac52e1
Binary files /dev/null and b/static/flags/ky.gif differ
diff --git a/static/flags/lb.gif b/static/flags/lb.gif
new file mode 100644
index 00000000..dcc202c2
Binary files /dev/null and b/static/flags/lb.gif differ
diff --git a/static/flags/lc.gif b/static/flags/lc.gif
new file mode 100644
index 00000000..2f73b350
Binary files /dev/null and b/static/flags/lc.gif differ
diff --git a/static/flags/lk.gif b/static/flags/lk.gif
new file mode 100644
index 00000000..0dfb6393
Binary files /dev/null and b/static/flags/lk.gif differ
diff --git a/static/flags/lr.gif b/static/flags/lr.gif
new file mode 100644
index 00000000..9ee0ab2e
Binary files /dev/null and b/static/flags/lr.gif differ
diff --git a/static/flags/lv.gif b/static/flags/lv.gif
new file mode 100644
index 00000000..c0ab9919
Binary files /dev/null and b/static/flags/lv.gif differ
diff --git a/static/flags/me.gif b/static/flags/me.gif
new file mode 100644
index 00000000..3d3b1378
Binary files /dev/null and b/static/flags/me.gif differ
diff --git a/static/flags/mf.gif b/static/flags/mf.gif
new file mode 100644
index 00000000..0c21d69a
Binary files /dev/null and b/static/flags/mf.gif differ
diff --git a/static/flags/mm.gif b/static/flags/mm.gif
new file mode 100644
index 00000000..64418023
Binary files /dev/null and b/static/flags/mm.gif differ
diff --git a/static/flags/mq.gif b/static/flags/mq.gif
new file mode 100644
index 00000000..9b46c9a4
Binary files /dev/null and b/static/flags/mq.gif differ
diff --git a/static/flags/ms.gif b/static/flags/ms.gif
new file mode 100644
index 00000000..1c62fe79
Binary files /dev/null and b/static/flags/ms.gif differ
diff --git a/static/flags/mw.gif b/static/flags/mw.gif
new file mode 100644
index 00000000..aa352e87
Binary files /dev/null and b/static/flags/mw.gif differ
diff --git a/static/flags/na.gif b/static/flags/na.gif
new file mode 100644
index 00000000..9a78c9b5
Binary files /dev/null and b/static/flags/na.gif differ
diff --git a/static/flags/om.gif b/static/flags/om.gif
new file mode 100644
index 00000000..2a602aa0
Binary files /dev/null and b/static/flags/om.gif differ
diff --git a/static/flags/pf.gif b/static/flags/pf.gif
new file mode 100644
index 00000000..94b18bd4
Binary files /dev/null and b/static/flags/pf.gif differ
diff --git a/static/flags/pg.gif b/static/flags/pg.gif
new file mode 100644
index 00000000..77940040
Binary files /dev/null and b/static/flags/pg.gif differ
diff --git a/static/flags/ph.gif b/static/flags/ph.gif
new file mode 100644
index 00000000..4fa1f638
Binary files /dev/null and b/static/flags/ph.gif differ
diff --git a/static/flags/pn.gif b/static/flags/pn.gif
new file mode 100644
index 00000000..6d7223a4
Binary files /dev/null and b/static/flags/pn.gif differ
diff --git a/static/flags/pr.gif b/static/flags/pr.gif
new file mode 100644
index 00000000..79322432
Binary files /dev/null and b/static/flags/pr.gif differ
diff --git a/static/flags/pt.gif b/static/flags/pt.gif
new file mode 100644
index 00000000..c1f49ea9
Binary files /dev/null and b/static/flags/pt.gif differ
diff --git a/static/flags/pw.gif b/static/flags/pw.gif
new file mode 100644
index 00000000..6eed5075
Binary files /dev/null and b/static/flags/pw.gif differ
diff --git a/static/flags/py.gif b/static/flags/py.gif
new file mode 100644
index 00000000..90d48a5b
Binary files /dev/null and b/static/flags/py.gif differ
diff --git a/static/flags/re.gif b/static/flags/re.gif
new file mode 100644
index 00000000..0c21d69a
Binary files /dev/null and b/static/flags/re.gif differ
diff --git a/static/flags/ru.gif b/static/flags/ru.gif
new file mode 100644
index 00000000..7369b9e4
Binary files /dev/null and b/static/flags/ru.gif differ
diff --git a/static/flags/sd.gif b/static/flags/sd.gif
new file mode 100644
index 00000000..0765a0ab
Binary files /dev/null and b/static/flags/sd.gif differ
diff --git a/static/flags/sj.gif b/static/flags/sj.gif
new file mode 100644
index 00000000..b1117a7b
Binary files /dev/null and b/static/flags/sj.gif differ
diff --git a/static/flags/sk.gif b/static/flags/sk.gif
new file mode 100644
index 00000000..416379d3
Binary files /dev/null and b/static/flags/sk.gif differ
diff --git a/static/flags/sprite-hq.css b/static/flags/sprite-hq.css
new file mode 100644
index 00000000..f194b24b
--- /dev/null
+++ b/static/flags/sprite-hq.css
@@ -0,0 +1,215 @@
+.flag-sprite {display: inline-block;width:16px;height:11px;image-rendering:-moz-crisp-edges;image-rendering:pixelated;image-rendering:-o-crisp-edges;-ms-interpolation-mode:nearest-neighbor;background-image:url('sprite-hq.png')}
+.flag-a {background-position-x:0}
+.flag-_a {background-position-y:0}
+.flag-b {background-position-x:-16px}
+.flag-_b {background-position-y:-11px}
+.flag-c {background-position-x:-32px}
+.flag-_c {background-position-y:-22px}
+.flag-d {background-position-x:-48px}
+.flag-_d {background-position-y:-33px}
+.flag-e {background-position-x:-64px}
+.flag-_e {background-position-y:-44px}
+.flag-f {background-position-x:-80px}
+.flag-_f {background-position-y:-55px}
+.flag-g {background-position-x:-96px}
+.flag-_g {background-position-y:-66px}
+.flag-h {background-position-x:-112px}
+.flag-_h {background-position-y:-77px}
+.flag-i {background-position-x:-128px}
+.flag-_i {background-position-y:-88px}
+.flag-j {background-position-x:-144px}
+.flag-_j {background-position-y:-99px}
+.flag-k {background-position-x:-160px}
+.flag-_k {background-position-y:-110px}
+.flag-l {background-position-x:-176px}
+.flag-_l {background-position-y:-121px}
+.flag-m {background-position-x:-192px}
+.flag-_m {background-position-y:-132px}
+.flag-n {background-position-x:-208px}
+.flag-_n {background-position-y:-143px}
+.flag-o {background-position-x:-224px}
+.flag-_o {background-position-y:-154px}
+.flag-p {background-position-x:-240px}
+.flag-_p {background-position-y:-165px}
+.flag-q {background-position-x:-256px}
+.flag-_q {background-position-y:-176px}
+.flag-r {background-position-x:-272px}
+.flag-_r {background-position-y:-187px}
+.flag-s {background-position-x:-288px}
+.flag-_s {background-position-y:-198px}
+.flag-t {background-position-x:-304px}
+.flag-_t {background-position-y:-209px}
+.flag-u {background-position-x:-320px}
+.flag-_u {background-position-y:-220px}
+.flag-v {background-position-x:-336px}
+.flag-_v {background-position-y:-231px}
+.flag-w {background-position-x:-352px}
+.flag-_w {background-position-y:-242px}
+.flag-x {background-position-x:-368px}
+.flag-_x {background-position-y:-253px}
+.flag-y {background-position-x:-384px}
+.flag-_y {background-position-y:-264px}
+.flag-z {background-position-x:-400px}
+.flag-_z {background-position-y:-275px}
+.flag2x {background-size:832px 572px}
+.flag2x.flag-sprite {width:32px;height:22px;}
+.flag2x.flag-a {background-position-x:0}
+.flag2x.flag-_a {background-position-y:0}
+.flag2x.flag-b {background-position-x:-32px}
+.flag2x.flag-_b {background-position-y:-22px}
+.flag2x.flag-c {background-position-x:-64px}
+.flag2x.flag-_c {background-position-y:-44px}
+.flag2x.flag-d {background-position-x:-96px}
+.flag2x.flag-_d {background-position-y:-66px}
+.flag2x.flag-e {background-position-x:-128px}
+.flag2x.flag-_e {background-position-y:-88px}
+.flag2x.flag-f {background-position-x:-160px}
+.flag2x.flag-_f {background-position-y:-110px}
+.flag2x.flag-g {background-position-x:-192px}
+.flag2x.flag-_g {background-position-y:-132px}
+.flag2x.flag-h {background-position-x:-224px}
+.flag2x.flag-_h {background-position-y:-154px}
+.flag2x.flag-i {background-position-x:-256px}
+.flag2x.flag-_i {background-position-y:-176px}
+.flag2x.flag-j {background-position-x:-288px}
+.flag2x.flag-_j {background-position-y:-198px}
+.flag2x.flag-k {background-position-x:-320px}
+.flag2x.flag-_k {background-position-y:-220px}
+.flag2x.flag-l {background-position-x:-352px}
+.flag2x.flag-_l {background-position-y:-242px}
+.flag2x.flag-m {background-position-x:-384px}
+.flag2x.flag-_m {background-position-y:-264px}
+.flag2x.flag-n {background-position-x:-416px}
+.flag2x.flag-_n {background-position-y:-286px}
+.flag2x.flag-o {background-position-x:-448px}
+.flag2x.flag-_o {background-position-y:-308px}
+.flag2x.flag-p {background-position-x:-480px}
+.flag2x.flag-_p {background-position-y:-330px}
+.flag2x.flag-q {background-position-x:-512px}
+.flag2x.flag-_q {background-position-y:-352px}
+.flag2x.flag-r {background-position-x:-544px}
+.flag2x.flag-_r {background-position-y:-374px}
+.flag2x.flag-s {background-position-x:-576px}
+.flag2x.flag-_s {background-position-y:-396px}
+.flag2x.flag-t {background-position-x:-608px}
+.flag2x.flag-_t {background-position-y:-418px}
+.flag2x.flag-u {background-position-x:-640px}
+.flag2x.flag-_u {background-position-y:-440px}
+.flag2x.flag-v {background-position-x:-672px}
+.flag2x.flag-_v {background-position-y:-462px}
+.flag2x.flag-w {background-position-x:-704px}
+.flag2x.flag-_w {background-position-y:-484px}
+.flag2x.flag-x {background-position-x:-736px}
+.flag2x.flag-_x {background-position-y:-506px}
+.flag2x.flag-y {background-position-x:-768px}
+.flag2x.flag-_y {background-position-y:-528px}
+.flag2x.flag-z {background-position-x:-800px}
+.flag2x.flag-_z {background-position-y:-550px}
+.flag3x {background-size:1248px 858px}
+.flag3x.flag-sprite {width:48px;height:33px;}
+.flag3x.flag-a {background-position-x:0}
+.flag3x.flag-_a {background-position-y:0}
+.flag3x.flag-b {background-position-x:-48px}
+.flag3x.flag-_b {background-position-y:-33px}
+.flag3x.flag-c {background-position-x:-96px}
+.flag3x.flag-_c {background-position-y:-66px}
+.flag3x.flag-d {background-position-x:-144px}
+.flag3x.flag-_d {background-position-y:-99px}
+.flag3x.flag-e {background-position-x:-192px}
+.flag3x.flag-_e {background-position-y:-132px}
+.flag3x.flag-f {background-position-x:-240px}
+.flag3x.flag-_f {background-position-y:-165px}
+.flag3x.flag-g {background-position-x:-288px}
+.flag3x.flag-_g {background-position-y:-198px}
+.flag3x.flag-h {background-position-x:-336px}
+.flag3x.flag-_h {background-position-y:-231px}
+.flag3x.flag-i {background-position-x:-384px}
+.flag3x.flag-_i {background-position-y:-264px}
+.flag3x.flag-j {background-position-x:-432px}
+.flag3x.flag-_j {background-position-y:-297px}
+.flag3x.flag-k {background-position-x:-480px}
+.flag3x.flag-_k {background-position-y:-330px}
+.flag3x.flag-l {background-position-x:-528px}
+.flag3x.flag-_l {background-position-y:-363px}
+.flag3x.flag-m {background-position-x:-576px}
+.flag3x.flag-_m {background-position-y:-396px}
+.flag3x.flag-n {background-position-x:-624px}
+.flag3x.flag-_n {background-position-y:-429px}
+.flag3x.flag-o {background-position-x:-672px}
+.flag3x.flag-_o {background-position-y:-462px}
+.flag3x.flag-p {background-position-x:-720px}
+.flag3x.flag-_p {background-position-y:-495px}
+.flag3x.flag-q {background-position-x:-768px}
+.flag3x.flag-_q {background-position-y:-528px}
+.flag3x.flag-r {background-position-x:-816px}
+.flag3x.flag-_r {background-position-y:-561px}
+.flag3x.flag-s {background-position-x:-864px}
+.flag3x.flag-_s {background-position-y:-594px}
+.flag3x.flag-t {background-position-x:-912px}
+.flag3x.flag-_t {background-position-y:-627px}
+.flag3x.flag-u {background-position-x:-960px}
+.flag3x.flag-_u {background-position-y:-660px}
+.flag3x.flag-v {background-position-x:-1008px}
+.flag3x.flag-_v {background-position-y:-693px}
+.flag3x.flag-w {background-position-x:-1056px}
+.flag3x.flag-_w {background-position-y:-726px}
+.flag3x.flag-x {background-position-x:-1104px}
+.flag3x.flag-_x {background-position-y:-759px}
+.flag3x.flag-y {background-position-x:-1152px}
+.flag3x.flag-_y {background-position-y:-792px}
+.flag3x.flag-z {background-position-x:-1200px}
+.flag3x.flag-_z {background-position-y:-825px}
+.flag4x {background-size:1664px 1144px}
+.flag4x.flag-sprite {width:64px;height:44px;}
+.flag4x.flag-a {background-position-x:0}
+.flag4x.flag-_a {background-position-y:0}
+.flag4x.flag-b {background-position-x:-64px}
+.flag4x.flag-_b {background-position-y:-44px}
+.flag4x.flag-c {background-position-x:-128px}
+.flag4x.flag-_c {background-position-y:-88px}
+.flag4x.flag-d {background-position-x:-192px}
+.flag4x.flag-_d {background-position-y:-132px}
+.flag4x.flag-e {background-position-x:-256px}
+.flag4x.flag-_e {background-position-y:-176px}
+.flag4x.flag-f {background-position-x:-320px}
+.flag4x.flag-_f {background-position-y:-220px}
+.flag4x.flag-g {background-position-x:-384px}
+.flag4x.flag-_g {background-position-y:-264px}
+.flag4x.flag-h {background-position-x:-448px}
+.flag4x.flag-_h {background-position-y:-308px}
+.flag4x.flag-i {background-position-x:-512px}
+.flag4x.flag-_i {background-position-y:-352px}
+.flag4x.flag-j {background-position-x:-576px}
+.flag4x.flag-_j {background-position-y:-396px}
+.flag4x.flag-k {background-position-x:-640px}
+.flag4x.flag-_k {background-position-y:-440px}
+.flag4x.flag-l {background-position-x:-704px}
+.flag4x.flag-_l {background-position-y:-484px}
+.flag4x.flag-m {background-position-x:-768px}
+.flag4x.flag-_m {background-position-y:-528px}
+.flag4x.flag-n {background-position-x:-832px}
+.flag4x.flag-_n {background-position-y:-572px}
+.flag4x.flag-o {background-position-x:-896px}
+.flag4x.flag-_o {background-position-y:-616px}
+.flag4x.flag-p {background-position-x:-960px}
+.flag4x.flag-_p {background-position-y:-660px}
+.flag4x.flag-q {background-position-x:-1024px}
+.flag4x.flag-_q {background-position-y:-704px}
+.flag4x.flag-r {background-position-x:-1088px}
+.flag4x.flag-_r {background-position-y:-748px}
+.flag4x.flag-s {background-position-x:-1152px}
+.flag4x.flag-_s {background-position-y:-792px}
+.flag4x.flag-t {background-position-x:-1216px}
+.flag4x.flag-_t {background-position-y:-836px}
+.flag4x.flag-u {background-position-x:-1280px}
+.flag4x.flag-_u {background-position-y:-880px}
+.flag4x.flag-v {background-position-x:-1344px}
+.flag4x.flag-_v {background-position-y:-924px}
+.flag4x.flag-w {background-position-x:-1408px}
+.flag4x.flag-_w {background-position-y:-968px}
+.flag4x.flag-x {background-position-x:-1472px}
+.flag4x.flag-_x {background-position-y:-1012px}
+.flag4x.flag-y {background-position-x:-1536px}
+.flag4x.flag-_y {background-position-y:-1056px}
+.flag4x.flag-z {background-position-x:-1600px}
+.flag4x.flag-_z {background-position-y:-1100px}
\ No newline at end of file
diff --git a/static/flags/sprite-hq.png b/static/flags/sprite-hq.png
new file mode 100644
index 00000000..2d6dcba6
Binary files /dev/null and b/static/flags/sprite-hq.png differ
diff --git a/static/flags/sprite.css b/static/flags/sprite.css
new file mode 100644
index 00000000..74df5083
--- /dev/null
+++ b/static/flags/sprite.css
@@ -0,0 +1,53 @@
+.flag-sprite {display: inline-block;width:16px;height:11px;image-rendering:-moz-crisp-edges;image-rendering:pixelated;image-rendering:-o-crisp-edges;-ms-interpolation-mode:nearest-neighbor;background-image:url('sprite.png')}
+.flag-a {background-position-x:0}
+.flag-_a {background-position-y:0}
+.flag-b {background-position-x:-16px}
+.flag-_b {background-position-y:-11px}
+.flag-c {background-position-x:-32px}
+.flag-_c {background-position-y:-22px}
+.flag-d {background-position-x:-48px}
+.flag-_d {background-position-y:-33px}
+.flag-e {background-position-x:-64px}
+.flag-_e {background-position-y:-44px}
+.flag-f {background-position-x:-80px}
+.flag-_f {background-position-y:-55px}
+.flag-g {background-position-x:-96px}
+.flag-_g {background-position-y:-66px}
+.flag-h {background-position-x:-112px}
+.flag-_h {background-position-y:-77px}
+.flag-i {background-position-x:-128px}
+.flag-_i {background-position-y:-88px}
+.flag-j {background-position-x:-144px}
+.flag-_j {background-position-y:-99px}
+.flag-k {background-position-x:-160px}
+.flag-_k {background-position-y:-110px}
+.flag-l {background-position-x:-176px}
+.flag-_l {background-position-y:-121px}
+.flag-m {background-position-x:-192px}
+.flag-_m {background-position-y:-132px}
+.flag-n {background-position-x:-208px}
+.flag-_n {background-position-y:-143px}
+.flag-o {background-position-x:-224px}
+.flag-_o {background-position-y:-154px}
+.flag-p {background-position-x:-240px}
+.flag-_p {background-position-y:-165px}
+.flag-q {background-position-x:-256px}
+.flag-_q {background-position-y:-176px}
+.flag-r {background-position-x:-272px}
+.flag-_r {background-position-y:-187px}
+.flag-s {background-position-x:-288px}
+.flag-_s {background-position-y:-198px}
+.flag-t {background-position-x:-304px}
+.flag-_t {background-position-y:-209px}
+.flag-u {background-position-x:-320px}
+.flag-_u {background-position-y:-220px}
+.flag-v {background-position-x:-336px}
+.flag-_v {background-position-y:-231px}
+.flag-w {background-position-x:-352px}
+.flag-_w {background-position-y:-242px}
+.flag-x {background-position-x:-368px}
+.flag-_x {background-position-y:-253px}
+.flag-y {background-position-x:-384px}
+.flag-_y {background-position-y:-264px}
+.flag-z {background-position-x:-400px}
+.flag-_z {background-position-y:-275px}
\ No newline at end of file
diff --git a/static/flags/sprite.png b/static/flags/sprite.png
new file mode 100644
index 00000000..37711fd9
Binary files /dev/null and b/static/flags/sprite.png differ
diff --git a/static/flags/sr.gif b/static/flags/sr.gif
new file mode 100644
index 00000000..0d8c19ea
Binary files /dev/null and b/static/flags/sr.gif differ
diff --git a/static/flags/ss.gif b/static/flags/ss.gif
new file mode 100644
index 00000000..7a629a39
Binary files /dev/null and b/static/flags/ss.gif differ
diff --git a/static/flags/tc.gif b/static/flags/tc.gif
new file mode 100644
index 00000000..daebede0
Binary files /dev/null and b/static/flags/tc.gif differ
diff --git a/static/flags/tf.gif b/static/flags/tf.gif
new file mode 100644
index 00000000..df3684c5
Binary files /dev/null and b/static/flags/tf.gif differ
diff --git a/static/flags/tg.gif b/static/flags/tg.gif
new file mode 100644
index 00000000..7cbfe6ba
Binary files /dev/null and b/static/flags/tg.gif differ
diff --git a/static/flags/tj.gif b/static/flags/tj.gif
new file mode 100644
index 00000000..800b7a28
Binary files /dev/null and b/static/flags/tj.gif differ
diff --git a/static/flags/tm.gif b/static/flags/tm.gif
new file mode 100644
index 00000000..a00bde0d
Binary files /dev/null and b/static/flags/tm.gif differ
diff --git a/static/flags/tr.gif b/static/flags/tr.gif
new file mode 100644
index 00000000..35bf3202
Binary files /dev/null and b/static/flags/tr.gif differ
diff --git a/static/flags/ua.gif b/static/flags/ua.gif
new file mode 100644
index 00000000..f20ef72f
Binary files /dev/null and b/static/flags/ua.gif differ
diff --git a/static/flags/va.gif b/static/flags/va.gif
new file mode 100644
index 00000000..f3f84e64
Binary files /dev/null and b/static/flags/va.gif differ
diff --git a/static/flags/vg.gif b/static/flags/vg.gif
new file mode 100644
index 00000000..215ebb67
Binary files /dev/null and b/static/flags/vg.gif differ
diff --git a/static/flags/vn.gif b/static/flags/vn.gif
new file mode 100644
index 00000000..e843b7c0
Binary files /dev/null and b/static/flags/vn.gif differ
diff --git a/static/flags/vu.gif b/static/flags/vu.gif
new file mode 100644
index 00000000..70bfe34a
Binary files /dev/null and b/static/flags/vu.gif differ
diff --git a/static/flags/xk.gif b/static/flags/xk.gif
new file mode 100644
index 00000000..14e1b0c8
Binary files /dev/null and b/static/flags/xk.gif differ
diff --git a/static/flags/ye.gif b/static/flags/ye.gif
new file mode 100644
index 00000000..d596be37
Binary files /dev/null and b/static/flags/ye.gif differ
diff --git a/static/flags/yt.gif b/static/flags/yt.gif
new file mode 100644
index 00000000..b6359ee0
Binary files /dev/null and b/static/flags/yt.gif differ
diff --git a/static/flags/zm.gif b/static/flags/zm.gif
new file mode 100644
index 00000000..1058f29d
Binary files /dev/null and b/static/flags/zm.gif differ
diff --git a/static/flags/zw.gif b/static/flags/zw.gif
new file mode 100644
index 00000000..14806e3c
Binary files /dev/null and b/static/flags/zw.gif differ
diff --git a/templates/customers/customer_form.html b/templates/customers/customer_form.html
index 2a80c4f4..1b5c8e2b 100644
--- a/templates/customers/customer_form.html
+++ b/templates/customers/customer_form.html
@@ -1,46 +1,130 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n static%}
 {% load crispy_forms_filters %}
 {% block title %}{% trans "Customers" %}{% endblock title %}
 
 {% block content %}
 
-
+<link rel="stylesheet" href="{% static 'flags/sprite.css' %}">
 <div class="container">
-          <div class="row">
-            <div class="col-sm-9">
-              <div class="d-sm-flex justify-content-between">
-
-            <h3 class="mb-3">
+    <div class="row mb-3">
+        <div class="col-sm-6 col-md-8">
+            <div class="d-sm-flex justify-content-between">
+                <h3 class="mb-3">
                 {% if customer.created %}
-                    {{ _("Edit Customer") }}
+                {{ _("Edit Customer") }}
                 {% else %}
-                    {{ _("Add Customer") }}
+                {{ _("Add Customer") }}
                 {% endif %}
-            </h3>
-              </div>
+                </h3>
             </div>
-          </div>
-
-        <div class="row">
-          <div class="col-sm-9">
-
-          <form class="row g-3 mb-9" method="post" class="form" novalidate>
-                 {% csrf_token %}
-          {{ redirect_field }}
-            {{ form|crispy }}
-                {% for error in form.errors %}
-                <div class="text-danger">{{ error }}</div>
-                {% endfor %}
-             <div class="d-flex mb-3">
-                 <a href="{{request.META.HTTP_REFERER}}" class="btn btn-phoenix-primary me-2 px-6">{% trans "cancel"|capfirst %}</a>
-                   <button class="btn btn-primary" type="submit">
-                        <!--<i class="bi bi-save"></i> -->
-                        {{ _("Save") }}
+        </div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-sm-6 col-md-8">
+            <form class="row g-3" method="post" class="form" novalidate>
+                {% csrf_token %}
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="text" class="form-control" id="{{ form.first_name.id_for_label }}" name="{{ form.first_name.name }}" value="{{ form.first_name.value|default:'' }}" placeholder="{{ _("First Name")}}">
+                        <label for="{{ form.first_name.id_for_label }}">{{ _("First Name")}}</label>
+                        {{ form.first_name.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="text" class="form-control" id="{{ form.middle_name.id_for_label }}" name="{{ form.middle_name.name }}" value="{{ form.middle_name.value|default:'' }}" placeholder="{{ _("Middle Name")}}">
+                        <label for="{{ form.middle_name.id_for_label }}">{{ _("Middle Name")}}</label>
+                        {{ form.middle_name.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="text" class="form-control" id="{{ form.last_name.id_for_label }}" name="{{ form.last_name.name }}" value="{{ form.last_name.value|default:'' }}" placeholder="{{ _("Last Name")}}">
+                        <label for="{{ form.last_name.id_for_label }}">{{ _("Last Name")}}</label>
+                        {{ form.last_name.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-2">
+                    <div class="form-floating">
+                        <select class="form-control" id="{{ form.title.id_for_label }}" name="{{ form.title.name }}">
+                        {% for value, label in form.title.field.choices %}
+                        <option value="{{ value }}" {% if form.title.value == value %}selected{% endif %}>{{ label }}</option>
+                        {% endfor %}
+                        </select>
+                        <label for="{{ form.title.id_for_label }}">Title</label>
+                        {{ form.title.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-2">
+                    <div class="form-floating">
+                        <select class="form-control" id="{{ form.gender.id_for_label }}" name="{{ form.gender.name }}">
+                        {% for value, label in form.gender.field.choices %}
+                        <option value="{{ value }}" {% if form.gender.value == value %}selected{% endif %}>{{ label }}</option>
+                        {% endfor %}
+                        </select>
+                        <label for="{{ form.gender.id_for_label }}">{{ _("Gender") }}</label>
+                        {{ form.gender.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="date" class="form-control" id="{{ form.dob.id_for_label }}" name="{{ form.dob.name }}" value="{{ form.dob.value|date:'Y-m-d' }}">
+                        <label for="{{ form.dob.id_for_label }}">{{ _("Date of Birth")}}</label>
+                        {{ form.dob.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="email" class="form-control" id="{{ form.email.id_for_label }}" name="{{ form.email.name }}" value="{{ form.email.value|default:'' }}" placeholder="{{ _("Email") }}">
+                        <label for="{{ form.email.id_for_label }}">{{ _("Email") }}</label>
+                        {{ form.email.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="text" class="form-control" id="{{ form.national_id.id_for_label }}" name="{{ form.national_id.name }}" value="{{ form.national_id.value|default:'' }}" placeholder="{{ _("Enter national ID")}}">
+                        <label for="{{ form.national_id.id_for_label }}">{{ _("National ID")}}</label>
+                        {{ form.national_id.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <select class="form-control" id="{{ form.country.id_for_label }}" name="{{ form.country.name }}">
+                        {% for value, label in form.country.field.choices %}
+                        <option value="{{ value }}" {% if form.country.value == value %}selected{% endif %}>{{ label }}</option>
+                        {% endfor %}
+                        </select>
+                        <label for="{{ form.country.id_for_label }}">{{ _("Country") }}</label>
+                        {{ form.country.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                    <div class="form-floating">
+                        <input type="tel" class="form-control" id="{{ form.phone_number.id_for_label }}" name="{{ form.phone_number.name }}" value="{{ form.phone_number.value|default:'' }}" placeholder="phone">
+                        <i class="{{ country.flag_css }}"></i>
+                        <label for="{{ form.phone_number.id_for_label }}">{{ _("Phone Number")}}</label>
+                        {{ form.phone_number.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-12">
+                    <div class="form-floating">
+                        <textarea class="form-control" id="{{ form.address.id_for_label }}" name="{{ form.address.name }}" placeholder="Enter address">{{ form.address.value|default:'' }}</textarea>
+                        <label for="{{ form.address.id_for_label }}">{{ _("Address") }}</label>
+                        {{ form.address.errors }}
+                    </div>
+                </div>
+                <div class="col-sm-6 col-md-4">
+                <div class="d-flex mb-3">
+                    <a href="{{request.META.HTTP_REFERER}}" class="btn btn-phoenix-primary me-2 px-6">{% trans "cancel"|capfirst %}</a>
+                    <button class="btn btn-primary" type="submit">
+                    {{ _("Save") }}
                     </button>
                 </div>
+                </div>
             </form>
-          </div>
         </div>
+    </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
diff --git a/templates/users/user_form.html b/templates/users/user_form.html
index 28b4df52..ed1a63a6 100644
--- a/templates/users/user_form.html
+++ b/templates/users/user_form.html
@@ -1,26 +1,45 @@
 {% extends "base.html" %}
-{% load i18n static crispy_forms_filters %}
-
-{% block title %}{% trans "users" %}{% endblock title %}
+{% load i18n %}
+{% load crispy_forms_filters %}
+{% block title %}{% trans "Staff" %}{% endblock title %}
 
 {% block content %}
+
+
 <div class="container">
-  <div class="col-sm-6 col-md-8">
-    <div class="form row gx-3 gy-4">
-        <form method="post" enctype="multipart/form-data">
-          {% csrf_token %}
-          <div class="form-floating">
+<div class="row">
+            <div class="col-sm-9">
+              <div class="d-sm-flex justify-content-between">
+
+            <h3 class="mb-3">
+                {% if staff.created %}
+                    {{ _("Edit Staff") }}
+                {% else %}
+                    {{ _("Add Staff") }}
+                {% endif %}
+            </h3>
+              </div>
+            </div>
+          </div>
+        <div class="row">
+          <div class="col-sm-9">
+
+          <form class="row g-3 mb-9" method="post" class="form" novalidate>
+                 {% csrf_token %}
+          {{ redirect_field }}
             {{ form|crispy }}
+                {% for error in form.errors %}
+                <div class="text-danger">{{ error }}</div>
+                {% endfor %}
+             <div class="d-flex mb-3">
+                 <a href="{{request.META.HTTP_REFERER}}" class="btn btn-phoenix-primary me-2 px-6">{% trans "cancel"|capfirst %}</a>
+                   <button class="btn btn-primary" type="submit">
+                        <!--<i class="bi bi-save"></i> -->
+                        {{ _("Save") }}
+                    </button>
+                </div>
+            </form>
           </div>
-          {% for error in form.errors %}
-          <div class="text-danger">{{ error }}</div>
-          {% endfor %}
-          <div class="col-auto">
-            <button type="submit" class="btn btn-primary me-1">{{ _("Save") }}</button>
-            <a href="{{ request.META.HTTP_REFERER }}" class="btn btn-sm btn-danger">{% trans "Cancel" %}</a>
-          </div>
-        </form>
-    </div>
-  </div>
+        </div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file