diff --git a/.DS_Store b/.DS_Store
index a4ecfc07..cabd21d1 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.idea/car_inventory.iml b/.idea/car_inventory.iml
index d635af89..b4e02268 100644
--- a/.idea/car_inventory.iml
+++ b/.idea/car_inventory.iml
@@ -28,6 +28,11 @@
     <orderEntry type="library" name="line" level="application" />
     <orderEntry type="library" name="@turf/turf" level="application" />
     <orderEntry type="library" name="apexcharts" level="application" />
+    <orderEntry type="library" name="moment.js" level="application" />
+    <orderEntry type="library" name="moment-timezone" level="application" />
+    <orderEntry type="library" name="fullcalendar" level="application" />
+    <orderEntry type="library" name="popper.js" level="application" />
+    <orderEntry type="library" name="tempusdominus-bootstrap-4" level="application" />
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_CONFIGURATION" value="Django" />
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
index a09fb84f..9aaddcd0 100644
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="file://$PROJECT_DIR$" libraries="{@turf/turf, @zxing, apexcharts, bootstrap-icons, jquery, jquery-3.5.1, line, quagga, sweetalert2, tesseract.js}" />
+    <file url="file://$PROJECT_DIR$" libraries="{@turf/turf, @zxing, apexcharts, bootstrap-icons, fullcalendar, jquery, jquery-3.5.1, line, moment-timezone, moment.js, popper.js, quagga, sweetalert2, tempusdominus-bootstrap-4, tesseract.js}" />
   </component>
 </project>
\ No newline at end of file
diff --git a/car_inventory/__pycache__/settings.cpython-311.pyc b/car_inventory/__pycache__/settings.cpython-311.pyc
index 638743e0..1d8538d7 100644
Binary files a/car_inventory/__pycache__/settings.cpython-311.pyc and b/car_inventory/__pycache__/settings.cpython-311.pyc differ
diff --git a/inventory/__pycache__/admin.cpython-311.pyc b/inventory/__pycache__/admin.cpython-311.pyc
index 9d7637a2..179bca8f 100644
Binary files a/inventory/__pycache__/admin.cpython-311.pyc and b/inventory/__pycache__/admin.cpython-311.pyc differ
diff --git a/inventory/__pycache__/forms.cpython-311.pyc b/inventory/__pycache__/forms.cpython-311.pyc
index ad327b14..1a96f99b 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 123fcb2d..46d38025 100644
Binary files a/inventory/__pycache__/models.cpython-311.pyc and b/inventory/__pycache__/models.cpython-311.pyc differ
diff --git a/inventory/__pycache__/urls.cpython-311.pyc b/inventory/__pycache__/urls.cpython-311.pyc
index 502bee32..3e4ab754 100644
Binary files a/inventory/__pycache__/urls.cpython-311.pyc and b/inventory/__pycache__/urls.cpython-311.pyc differ
diff --git a/inventory/__pycache__/views.cpython-311.pyc b/inventory/__pycache__/views.cpython-311.pyc
index 36fadac5..91501b1b 100644
Binary files a/inventory/__pycache__/views.cpython-311.pyc and b/inventory/__pycache__/views.cpython-311.pyc differ
diff --git a/inventory/admin.py b/inventory/admin.py
index e595ddf8..2b76c96b 100644
--- a/inventory/admin.py
+++ b/inventory/admin.py
@@ -33,6 +33,8 @@ admin.site.register(models.Customer)
 admin.site.register(models.Opportunity)
 admin.site.register(models.Notification)
 admin.site.register(models.Lead)
+admin.site.register(models.Activity)
+admin.site.register(models.Schedule)
 
 @admin.register(models.CarMake)
 class CarMakeAdmin(admin.ModelAdmin):
diff --git a/inventory/forms.py b/inventory/forms.py
index 6a6c0ff3..be277355 100644
--- a/inventory/forms.py
+++ b/inventory/forms.py
@@ -38,7 +38,7 @@ from .models import (
     Opportunity, Priority, Sources, Lead, Activity, Notes, CarModel,
     SaleOrder
 )
-from django_ledger.models import ItemModel, InvoiceModel, BillModel,VendorModel
+from django_ledger import models as ledger_models
 from django.forms import ModelMultipleChoiceField, ValidationError, DateInput,DateTimeInput
 from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
@@ -191,7 +191,7 @@ class CarForm(
                 (obj.id_car_model, obj.get_local_name()) for obj in queryset
             ]
         if "vendor" in self.fields:
-            self.fields["vendor"].queryset = VendorModel.objects.filter(active=True)
+            self.fields["vendor"].queryset = ledger_models.VendorModel.objects.filter(active=True)
             # queryset = self.fields["vendor"].queryset
             # self.fields["vendor"].choices = [
             #     (obj.pk, obj.get_local_name()) for obj in queryset
@@ -596,7 +596,7 @@ class WizardForm3(forms.Form):
 
 class ItemForm(forms.Form):
     item = forms.ModelChoiceField(
-        queryset=ItemModel.objects.all(), label="Item", required=True,
+        queryset=ledger_models.ItemModel.objects.all(), label="Item", required=True,
         validators=[MinLengthValidator(5)],
     )
     quantity = forms.DecimalField(label="Quantity", required=True)
@@ -607,10 +607,10 @@ class ItemForm(forms.Form):
 
 class PaymentForm(forms.Form):
     invoice = forms.ModelChoiceField(
-        queryset=InvoiceModel.objects.all(), label="Invoice", required=False
+        queryset=ledger_models.InvoiceModel.objects.all(), label="Invoice", required=False
     )
     bill = forms.ModelChoiceField(
-        queryset=BillModel.objects.all(), label="Bill", required=False
+        queryset=ledger_models.BillModel.objects.all(), label="Bill", required=False
     )
     amount = forms.DecimalField(label="Amount", required=True)
     payment_method = forms.ChoiceField(
@@ -680,6 +680,7 @@ class ScheduleForm(forms.ModelForm):
         model = Schedule
         fields = ['purpose','scheduled_type', 'scheduled_at', 'notes']
 
+
 class NoteForm(forms.ModelForm):
     class Meta:
         model = Notes
@@ -729,6 +730,32 @@ class SaleOrderForm(forms.ModelForm):
         }
 
 class EstimateModelCreateForm(EstimateModelCreateFormBase):
+    class Meta:
+        model = ledger_models.EstimateModel
+        fields = ['title', 'customer', 'terms']
+        widgets = {
+            'customer': forms.Select(attrs={
+                'id': 'djl-customer-estimate-customer-input',
+                'class': 'input',
+                'label': _('Customer MARWAN'),
+            }),
+            'terms': forms.Select(attrs={
+                'id': 'djl-customer-estimate-terms-input',
+                'class': 'input',
+                'label': _('Terms'),
+            }),
+            'title': forms.TextInput(attrs={
+                'id': 'djl-customer-job-title-input',
+                'class': 'input' + ' is-large',
+
+                'label': _('Title'),
+            })
+        }
+        labels = {
+            'title': _('Title'),
+            'terms': _('Terms'),
+            'customer': _('Customer'),
+        }
     def __init__(self, *args, entity_slug, user_model, **kwargs):
         super(EstimateModelCreateForm, self).__init__(*args, entity_slug=entity_slug, user_model=user_model, **kwargs)
         self.ENTITY_SLUG = entity_slug
diff --git a/inventory/migrations/0012_merge_20250206_1151.py b/inventory/migrations/0012_merge_20250206_1151.py
new file mode 100644
index 00000000..5034543c
--- /dev/null
+++ b/inventory/migrations/0012_merge_20250206_1151.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.1.5 on 2025-02-06 08:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0002_alter_carregistration_car'),
+        ('inventory', '0011_remove_lead_year_alter_schedule_customer'),
+    ]
+
+    operations = [
+    ]
diff --git a/inventory/migrations/0013_alter_carregistration_text2_and_more.py b/inventory/migrations/0013_alter_carregistration_text2_and_more.py
new file mode 100644
index 00000000..98bb0ab7
--- /dev/null
+++ b/inventory/migrations/0013_alter_carregistration_text2_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.1.5 on 2025-02-07 01:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0012_merge_20250206_1151'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='carregistration',
+            name='text2',
+            field=models.CharField(blank=True, max_length=1, null=True, verbose_name='Text 2'),
+        ),
+        migrations.AlterField(
+            model_name='carregistration',
+            name='text3',
+            field=models.CharField(blank=True, max_length=1, null=True, verbose_name='Text 3'),
+        ),
+    ]
diff --git a/inventory/models.py b/inventory/models.py
index 82143e22..1ab004ef 100644
--- a/inventory/models.py
+++ b/inventory/models.py
@@ -1,4 +1,5 @@
-from datetime import timezone
+# from datetime import timezone
+from django.utils import timezone
 import itertools
 from uuid import uuid4
 from django.conf import settings
@@ -1340,7 +1341,7 @@ class Activity(models.Model):
         verbose_name_plural = _("Activities")
 
     def __str__(self):
-        return f"{self.get_activity_type_display()} by {self.created_by.name} on {self.content_object}"
+        return f"{self.get_activity_type_display()} by {self.created_by.get_full_name} on {self.content_object}"
 
 
 class Notification(models.Model):
diff --git a/inventory/signals.py b/inventory/signals.py
index 678eed88..e50d52da 100644
--- a/inventory/signals.py
+++ b/inventory/signals.py
@@ -855,3 +855,14 @@ def update_car_status_on_reservation_update(sender, instance, **kwargs):
 #     items = instance.get_itemtxs_data()[0].all()
 #     total = sum([Decimal(item.item_model.additional_info['car_finance']["selling_price"]) * Decimal(item.ce_quantity) for item in items])
 
+@receiver(post_save, sender=models.Schedule)
+def create_activity_on_schedule_creation(sender, instance, created, **kwargs):
+    if created:
+        models.Activity.objects.create(
+            content_object=instance,
+            activity_type='Schedule Created',
+            created_by=instance.scheduled_by.user,
+            notes=f"New schedule created for {instance.purpose} with {instance.customer.customer_name} on {instance.scheduled_at}."
+        )
+
+
diff --git a/inventory/views.py b/inventory/views.py
index 0015b501..0b808ded 100644
--- a/inventory/views.py
+++ b/inventory/views.py
@@ -2434,7 +2434,7 @@ def create_estimate(request):
         return JsonResponse(
             {
                 "status": "success",
-                "message": "Estimate created successfully!",
+                "message": "Quotation created successfully!",
                 "url": f"{url}",
             }
         )
diff --git a/requirements.txt b/requirements.txt
index 64c13cf9..076ece4d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -40,7 +40,7 @@ dj-rest-auth==7.0.1
 dj-shop-cart==8.0.0a2
 Django==5.1.5
 django-allauth==65.3.1
-django-appointment==3.7.4
+django-appointment==3.8.0
 django-autoslug==1.9.9
 django-bootstrap5==24.3
 django-classy-tags==4.1.0
diff --git a/static/.DS_Store b/static/.DS_Store
index d36bb7e2..ef151623 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ
diff --git a/static/css/app_admin/admin.css b/static/css/app_admin/admin.css
new file mode 100644
index 00000000..2a8b22bb
--- /dev/null
+++ b/static/css/app_admin/admin.css
@@ -0,0 +1,53 @@
+/* Hide scrollbar for day grid month view on small screens */
+
+@media (max-width: 767px) {
+    .djangoAppt_no-events {
+        margin-bottom: 10px;
+    }
+
+    .djangoAppt_btn-new-event {
+        padding: 5px 8px !important;
+        font-size: 13px !important;
+    }
+
+    .fc-dayGridMonth-view .fc-scroller {
+        overflow: hidden !important;
+    }
+
+    .modal-content {
+        margin: 0 auto !important;
+    }
+
+    .modal-footer {
+        text-align: left !important;
+        flex-wrap: inherit !important;
+        justify-content: center !important;
+        align-content: flex-start;
+    }
+
+    #eventDetailsModal .btn {
+        margin-right: 2px !important;
+        font-size: 13px !important;
+    }
+
+    #eventModalBody, #serviceSelect {
+        font-size: 13px !important;
+    }
+
+    #eventModalLabel {
+        font-size: 15px !important;
+    }
+}
+
+/* Hide scrollbar for time grid day view on larger screens */
+@media (min-width: 450px) {
+    .fc-timeGridDay-view .fc-scroller {
+        overflow: hidden !important;
+    }
+}
+
+@media (min-width: 600px) {
+    .fc-scroller {
+        overflow: hidden !important;
+    }
+}
\ No newline at end of file
diff --git a/static/css/app_admin/btn.css b/static/css/app_admin/btn.css
new file mode 100644
index 00000000..ab8fda40
--- /dev/null
+++ b/static/css/app_admin/btn.css
@@ -0,0 +1,144 @@
+.section-content-button {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.modify-btn {
+    color: #fff;
+    padding: 8px 12px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    text-decoration: none;
+    transition: all 0.3s; /* Consistent transition */
+}
+
+/* Button hover effects for a dynamic touch */
+.modify-btn:hover {
+    box-shadow: 0 6px 15px rgba(0, 0, 0, 0.1);
+    transform: scale(1.05) translateY(-3px);
+}
+
+.button-color-blue {
+    background: linear-gradient(90deg, #007BFF, #0056b3);
+}
+
+.button-color-red {
+    background: linear-gradient(90deg, #dc3545, #c82333);
+}
+
+.button-color-green {
+    background: linear-gradient(90deg, #28a745, #218838);
+}
+
+.button-color-yellow {
+    background: linear-gradient(90deg, #ffc107, #d39e00);
+}
+
+.button-color-purple {
+    background: linear-gradient(90deg, #6f42c1, #5a32a3);
+}
+
+.button-color-orange {
+    background: linear-gradient(90deg, #fd7e14, #e66400);
+}
+
+.button-color-teal {
+    background: linear-gradient(90deg, #20c997, #17a2b8);
+}
+
+.button-color-pink {
+    background: linear-gradient(90deg, #e83e8c, #d63384);
+}
+
+.button-color-gray {
+    background: linear-gradient(90deg, #6c757d, #5a636e);
+}
+
+.button-color-blue:hover {
+    background: linear-gradient(90deg, #0056b3, #007BFF); /* Reverse gradient on hover */
+    transform: scale(1.05); /* Slight scale on hover for engagement */
+    color: #babaf5;
+}
+
+.button-color-red:hover {
+    background: linear-gradient(90deg, #c82333, #dc3545);
+    transform: scale(1.05);
+    color: #efcece;
+}
+
+.button-color-green:hover {
+    background: linear-gradient(90deg, #218838, #28a745);
+    transform: scale(1.05);
+    color: #c3e6cb;
+}
+
+.button-color-yellow:hover {
+    background: linear-gradient(90deg, #d39e00, #ffc107); /* Reverse gradient on hover */
+    transform: scale(1.05); /* Slight scale on hover for engagement */
+    color: #ffe58a;
+}
+
+.button-color-purple:hover {
+    background: linear-gradient(90deg, #5a32a3, #6f42c1);
+    transform: scale(1.05);
+    color: #d1b6e1;
+}
+
+.button-color-orange:hover {
+    background: linear-gradient(90deg, #e66400, #fd7e14);
+    transform: scale(1.05);
+    color: #ffcc99;
+}
+
+.button-color-teal:hover {
+    background: linear-gradient(90deg, #17a2b8, #20c997);
+    transform: scale(1.05);
+    color: #ace2e1;
+}
+
+.button-color-pink:hover {
+    background: linear-gradient(90deg, #d63384, #e83e8c);
+    transform: scale(1.05);
+    color: #f2a6c6;
+}
+
+.button-color-gray:hover {
+    background: linear-gradient(90deg, #5a636e, #6c757d);
+    transform: scale(1.05);
+    color: #d1d5d9;
+}
+
+.buttons-container {
+    display: flex;
+    gap: 5px; /* Provides space between the buttons */
+}
+
+.service-btn-container {
+    display: flex;
+    flex-direction: row;
+    gap: 20px;
+}
+
+.service-btn {
+    padding: 8px 20px !important;
+}
+
+@media screen and (max-width: 768px) {
+    .modify-btn {
+        padding: 6px 10px;
+        font-size: 14px;
+    }
+}
+
+@media screen and (max-width: 487px) {
+    .section-content-button.modify-btn {
+        padding: 4px 8px;
+        font-size: 12px;
+    }
+
+    .buttons-container {
+        gap: 3px;
+    }
+}
\ No newline at end of file
diff --git a/static/css/app_admin/days_off.css b/static/css/app_admin/days_off.css
new file mode 100644
index 00000000..ddd86dd9
--- /dev/null
+++ b/static/css/app_admin/days_off.css
@@ -0,0 +1,35 @@
+.days-off-form-wrapper {
+    margin: 0 auto;
+    padding-top: 50px;
+}
+
+.days-off-form-wrapper h2 {
+    margin-top: 0;
+    margin-bottom: 20px;
+    text-align: center;
+}
+
+.do-form-content {
+    padding: 20px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    max-width: 600px;
+    margin: 0 auto;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+.form-group {
+    margin-bottom: 20px;
+}
+
+.form-group label {
+    display: block;
+    margin-bottom: 5px;
+}
+
+.form-group input, .form-group select, .form-group textarea {
+    width: 100%;
+    padding: 10px;
+    border: 1px solid #e0e0e0;
+    border-radius: 4px;
+}
diff --git a/static/css/app_admin/display_appointment.css b/static/css/app_admin/display_appointment.css
new file mode 100644
index 00000000..2673e8b4
--- /dev/null
+++ b/static/css/app_admin/display_appointment.css
@@ -0,0 +1,140 @@
+.appointment-display-content{
+    margin: 30px auto;
+    padding: 20px 0;
+}
+
+.app-content {
+    max-width: 950px;
+    padding: 20px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    margin: 0 auto;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+@keyframes fadeIn {
+    from {
+        opacity: 0;
+        transform: translateY(800px);
+        background-color: transparent;
+    }
+    to   {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+@keyframes fadeInGreen {
+    from {
+        background-color: transparent;
+    }
+    to   {
+        background-color: #4CAF50; /* green */
+    }
+}
+
+@keyframes fadeInRed {
+    from {
+        background-color: transparent;
+    }
+    to   {
+        background-color: #F44336; /* red */
+    }
+}
+
+
+.appointment-card {
+    border: 1px solid #e0e0e0;
+    padding: 20px;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+    margin-top: 20px;
+    animation: fadeIn 0.5s forwards;
+    display: flex;
+    flex-direction: column;
+    align-items: center; /* Center the contents */
+}
+
+.appointment-card h2 {
+    margin-top: 0;
+    border-bottom: 1px solid #e0e0e0;
+    padding-bottom: 10px;
+    width: 100%;
+}
+
+.appointment-details {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 20px;
+    width: 100%;
+    justify-content: space-between; /* Evenly space the details */
+}
+
+.appointment-detail, .appointment-detail-payment {
+    flex: 1;
+    padding: 10px;
+    border: 1px solid #e0e0e0;
+    margin: 5px;
+    border-radius: 4px;
+    flex-basis: 48%; /* Allow 2 details per row with a little space in between */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* Add subtle shadow */
+    transition: all 0.3s; /* Smooth transitions */
+    animation: fadeIn 0.6s forwards; /* Default fade-in */
+}
+
+.appointment-detail:nth-child(1) { animation-delay: 0.05s; }
+.appointment-detail:nth-child(2) { animation-delay: 0.05s; }
+.appointment-detail:nth-child(3) { animation-delay: 0.1s; }
+.appointment-detail:nth-child(4) { animation-delay: 0.1s; }
+.appointment-detail:nth-child(5) { animation-delay: 0.15s; }
+.appointment-detail:nth-child(6) { animation-delay: 0.15s; }
+.appointment-detail:nth-child(7) { animation-delay: 0.2s; }
+.appointment-detail:nth-child(8) { animation-delay: 0.2s; }
+.appointment-detail:nth-child(9) { animation-delay: 0.25s; }
+.appointment-detail:nth-child(10) { animation-delay: 0.25s; }
+.appointment-detail:nth-child(11) { animation-delay: 0.3s; }
+.appointment-detail:nth-child(12) { animation-delay: 0.3s; }
+
+.is-paid-true {
+    animation: fadeIn 0.35s forwards, fadeInGreen 0.35s forwards;
+    color: white;
+}
+
+.is-paid-false {
+    animation: fadeIn 0.35s forwards, fadeInRed 0.35s forwards;
+    color: white;
+}
+
+
+.hover-element:hover {
+    background-color: #f7f7f7;
+    transform: translateY(-5px); /* Slight elevation on hover */
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15); /* Enhanced shadow on hover */
+}
+
+.appointment-detail i {
+    margin-right: 10px;
+    color: #555; /* Slightly darker icon color */
+}
+
+/* Mobile First Styles (Default) */
+.appointment-detail, .appointment-detail-payment {
+    flex-basis: 100%; /* Each detail takes the full width on mobile */
+    margin: 10px 0; /* Adjusted margin */
+}
+
+/* Tablet Styles */
+@media (min-width: 768px) and (max-width: 991px) {
+    .appointment-detail, .appointment-detail-payment {
+        flex-basis: 48%; /* 2 details per row for tablets */
+        margin: 5px; /* Revert to original margin */
+    }
+}
+
+/* Desktop Styles */
+@media (min-width: 992px) {
+    .appointment-detail, .appointment-detail-payment {
+        flex-basis: 48%; /* 2 details per row for desktop */
+        margin: 5px;
+    }
+}
diff --git a/static/css/app_admin/service.css b/static/css/app_admin/service.css
new file mode 100644
index 00000000..c6e859f9
--- /dev/null
+++ b/static/css/app_admin/service.css
@@ -0,0 +1,37 @@
+.service-form-wrapper {
+    padding: 20px 0;
+}
+
+.service-form-content {
+    padding: 20px;
+    margin: 30px auto;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    max-width: 600px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+h2 {
+    border-bottom: 1px solid #e0e0e0;
+    padding-bottom: 15px;
+    margin-bottom: 30px;
+    font-weight: 600;
+}
+
+.form-control {
+    width: 100%;
+    padding: 5px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    transition: border 0.3s;
+}
+
+.form-control:focus {
+    border-color: #007BFF;
+    box-shadow: 0 0 5px rgba(0,123,255,0.2);
+}
+
+/* Design TextArea */
+textarea.form-control {
+    height:60px;
+}
\ No newline at end of file
diff --git a/static/css/app_admin/staff_member.css b/static/css/app_admin/staff_member.css
new file mode 100644
index 00000000..ad9ed6b2
--- /dev/null
+++ b/static/css/app_admin/staff_member.css
@@ -0,0 +1,92 @@
+/* staff_form.css */
+.staff-form-wrapper {
+    margin: 15px auto;
+    padding: 10px 0;
+}
+
+.staff-form-content {
+    padding: 20px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    max-width: 1100px;
+    margin: 0 auto;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+h3 {
+    border-bottom: 1px solid #e0e0e0;
+    padding-bottom: 15px;
+    margin-bottom: 20px;
+    font-weight: 500;
+}
+
+.form-group {
+    margin-bottom: 20px;
+}
+
+.form-group label {
+    display: block;
+    margin-bottom: 8px;
+    font-weight: 500;
+}
+
+.form-control {
+    width: 100%;
+    padding: 2px 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    transition: border 0.3s;
+}
+
+.form-control:focus {
+    border-color: #007BFF;
+    box-shadow: 0 0 5px rgba(0,123,255,0.2);
+}
+
+.form-check {
+    margin-bottom: 10px;
+}
+
+.form-check label {
+    margin-left: 5px;
+    font-weight: 400;
+}
+
+.btn {
+    padding: 10px 20px;
+    border: none;
+    background-color: #007bff;
+    color: #fff;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: background-color 0.3s;
+}
+
+.btn:hover {
+    background-color: #0056b3;
+}
+
+/* ############################### */
+.user-not-found {
+    margin-top: 2px;
+    margin-bottom: 20px;
+    padding: 5px;
+    background-color: #f9f9f9;
+    border-radius: 4px;
+    font-size: 0.9rem;
+}
+
+.user-not-found a {
+    color: #007bff;
+    text-decoration: underline;
+}
+
+.user-not-found small {
+    color: #666;
+}
+
+small {
+    color: #3d3d3d;
+    font-size: 12px;
+}
+
diff --git a/static/css/app_admin/user_profile.css b/static/css/app_admin/user_profile.css
new file mode 100644
index 00000000..d1ee4d2b
--- /dev/null
+++ b/static/css/app_admin/user_profile.css
@@ -0,0 +1,202 @@
+body {
+    font-family: 'Arial', sans-serif;
+}
+
+.profile-container {
+    margin: 5px auto;
+    background-color: #fff;
+    border-radius: 8px;
+}
+
+.service-container {
+    margin: 5px auto;
+    border-radius: 8px;
+}
+
+.profile-section {
+    border: 1px solid inherit;
+    max-width: 1000px;
+    padding: 20px;
+    margin: 0 auto 30px auto;
+    position: relative;
+    background-color: inherit;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+    border-radius: 6px;
+    transition: all 0.3s;
+}
+
+.profile-section:hover {
+    transform: translateY(-5px);
+    box-shadow: 0 4px 15px rgba(0, 0, 0, 0.12);
+}
+
+.section-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.section-content {
+    margin-top: 20px;
+}
+
+.profile-section h2 {
+    margin-bottom: 20px; /* Space between the title and content */
+}
+
+.profile-section p {
+    line-height: 1.5em; /* Enhanced line spacing for readability */
+    margin-bottom: 15px;
+}
+
+table {
+    width: 100%;
+    border-collapse: collapse;
+    margin: 20px 0;
+    font-size: 16px;
+    text-align: left;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+    border-radius: 6px;
+    overflow: hidden; /* To respect border-radius in tables */
+}
+
+table th, table td {
+    padding: 12px 15px;
+    border-bottom: 1px solid #ddd;
+    transition: background-color 0.3s; /* Smooth transition for hover effect */
+}
+
+table th {
+    background-color: #f2f2f2;
+    font-weight: bold;
+}
+
+table tbody tr:hover {
+    background-color: #f5f5f5;
+}
+
+
+/* Adding gradient backgrounds for a more vibrant look */
+.profile-container {
+    /*background-image: linear-gradient(to bottom right, #fff, #f7f9fc);*/
+}
+
+/* Additional hover effect for the sections */
+.profile-section:hover {
+    box-shadow: 0 6px 20px rgba(0, 0, 0, 0.08);
+}
+
+/* Elegant & smooth transitions for all elements */
+* {
+    transition: all 0.3s ease-out;
+}
+
+/* Elevate the table headers for a layered appearance */
+table th {
+    position: relative;
+    z-index: 2;
+    box-shadow: 0 6px 10px rgba(0, 0, 0, 0.06);
+}
+
+/* Subtle hover effects for table rows */
+table tbody tr {
+    position: relative;
+    z-index: 1;
+    transform: scale(1);
+    transition: transform 0.3s, box-shadow 0.3s;
+}
+
+table tbody tr:hover {
+    transform: scale(1.01);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+}
+
+/* Animate the appearance of the profile sections for a smooth load-in effect */
+@keyframes slideInFromLeft {
+    0% {
+        transform: translateX(-100%);
+        opacity: 0;
+    }
+    100% {
+        transform: translateX(0);
+        opacity: 1;
+    }
+}
+
+.profile-section {
+    animation: slideInFromLeft 0.6s forwards;
+}
+
+/* Staggered animation delays for each section for a sequential load-in */
+.profile-section:nth-child(1) {
+    animation-delay: 0.2s;
+}
+
+.profile-section:nth-child(2) {
+    animation-delay: 0.4s;
+}
+
+.profile-section:nth-child(3) {
+    animation-delay: 0.6s;
+}
+
+.profile-section:nth-child(4) {
+    animation-delay: 0.8s;
+}
+
+.profile-section:nth-child(5) {
+    animation-delay: 1.0s;
+}
+
+/* Consider adding this for a smoother feel when scrolling */
+body {
+    scroll-behavior: smooth;
+}
+
+
+/* Responsive design for tablets and mobile devices */
+@media screen and (max-width: 768px) {
+    .profile-container {
+        margin: 20px 10px;
+        padding: 15px;
+    }
+
+    .profile-section {
+        padding: 15px;
+    }
+
+    .section-content-button {
+        top: 10px;
+        right: 10px;
+    }
+
+    table th, table td {
+        padding: 10px;
+    }
+
+    .profile-section h2 {
+        font-size: 20px;
+        margin-bottom: 15px;
+    }
+
+    .profile-section p {
+        font-size: 14px;
+    }
+
+    .responsive-table-container {
+        overflow-x: auto; /* Allows horizontal scrolling */
+        -webkit-overflow-scrolling: touch; /* Smooth scroll for touch devices */
+    }
+
+    /* Optional: Add a shadow on the right to indicate more content */
+    .responsive-table-container::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 10px;
+        height: 100%;
+        box-shadow: -5px 0 10px rgba(0, 0, 0, 0.05);
+        pointer-events: none; /* Ensures it doesn't interfere with other interactions */
+    }
+}
diff --git a/static/css/appointments-user-details.css b/static/css/appointments-user-details.css
new file mode 100644
index 00000000..24211723
--- /dev/null
+++ b/static/css/appointments-user-details.css
@@ -0,0 +1,262 @@
+/* Set margins for the main container */
+.main-container {
+    margin-left: 20px;
+    margin-right: 20px;
+}
+
+/* Center and set max width for the body container */
+.body-container {
+    margin: 0 auto;
+    max-width: 1080px;
+    padding: 0 15px;
+}
+
+/* Set display and margin for page body */
+.page-body {
+    display: flex;
+    flex-direction: row;
+    margin-top: 50px;
+}
+
+/* Set flex for appointment user info */
+.appointment-user-info {
+    flex: 3;
+}
+
+/* Set flex and margin for service description and pay */
+.service-description-and-pay {
+    flex: 1;
+    margin-left: 20px; /* Adjust the value as needed */
+}
+
+/* Set margins and font styles for title sections */
+.appointment-user-info-title, .service-details-title, .payment-details-title {
+    margin-bottom: 10px;
+    font-family: Lobster, cursive;
+    font-size: 18px;
+    color: #0c042c;
+}
+
+/* Set font styles for description titles */
+.description-title {
+    font-size: 16px;
+    font-weight: 400;
+    color: #0c042c;
+}
+
+/* Set margins, borders, padding, and font styles for the "already have an account" section */
+.already-have-account {
+    margin-top: 25px;
+    margin-bottom: 30px;
+    width: 100%;
+    border: 1px solid #0c042c;
+    border-radius: 2px;
+    justify-content: left;
+    padding: 10px 8px;
+    display: flex;
+    align-items: center;
+    font-family: "DejaVu Serif", serif;
+}
+
+/* Set grid display and column gap for name and email input fields */
+.name-email {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    grid-gap: 10px;
+}
+
+/* Set margin and display for "receive email" checkbox */
+.receive-email {
+    margin-bottom: 20px;
+}
+
+/* Set margins and display for phone number, address, and additional information input fields */
+.address, .additional-information {
+    margin-top: 20px;
+    display: grid;
+}
+
+.phone-number {
+    margin-bottom: 15px;
+}
+
+.phone-input-container {
+    display: flex;
+    align-items: center; /* vertically center the items */
+}
+
+.phone-number select {
+    margin-right: 10px; /* add some space between them */
+}
+
+.phone-number input {
+    flex: 1; /* take available space */
+}
+
+.phone-number select {
+    padding: 6px 10px;
+    border-radius: 4px;
+    border: 1px solid #ccc;
+    appearance: none; /* remove default appearance */
+    background-color: #fff;
+    margin-right: 10px;
+    cursor: pointer;
+    font-size: 14px;
+    color: #333;
+    transition: border-color 0.3s;
+}
+
+.phone-number select:focus {
+    border-color: #007bff;
+    outline: none;
+}
+
+
+/* Set font styles for input labels */
+label {
+    font-family: "DejaVu Serif", serif;
+}
+
+/* Set margin for second part horizontal line */
+.second-part {
+    margin-top: 10px;
+}
+
+/* Set grid display, padding, and margin for user info input fields */
+.user-info-input {
+    margin-top: 20px;
+    display: grid;
+    padding: 30px 10px;
+}
+
+/* Set grid display, padding, margin, and font styles for service description */
+.service-description-content {
+    margin-top: 20px;
+    color: black;
+    padding-top: 30px;
+    display: grid;
+    grid-template-rows: 1fr 1fr 1fr;
+    grid-gap: 10px;
+    font-family: "DejaVu Serif", serif;
+    font-size: 16px;
+}
+
+/* Set font style for service name */
+.item-name {
+    color: black;
+}
+
+/* Set flex for title section */
+.title {
+    flex: 1;
+}
+
+/* Set color for links */
+a {
+    color: #0c042c;
+}
+
+/* Set padding, border radius, and font styles for input fields */
+.user-info input {
+    box-sizing: border-box;
+    padding: 5px;
+    border-radius: 5px;
+}
+
+.name-email {
+    margin-bottom: 15px;
+}
+
+/* Set width, margin and border */
+.user-info-input input[type="text"],
+.user-info-input input[type="email"],
+.user-info-input textarea {
+    width: 100%;
+    border: 1px solid #a2a2a2;
+}
+
+/* Set a 2px solid border with a specific color when the input or textarea is in focus */
+.user-info-input input[type="text"]:focus,
+.user-info-input input[type="email"]:focus,
+.user-info-input input[type="tel"]:focus,
+.user-info-input textarea:focus {
+    border: 2px solid #040f49;
+}
+
+/* Style for the payment total */
+.total {
+    margin-top: 20px;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-family: "DejaVu Serif", serif;
+    color: rgba(12, 4, 44, 0.93);
+    font-size: 16px;
+    line-height: 1.8;
+}
+
+/* Media query for screens up to 795px */
+@media only screen and (max-width: 795px) {
+
+    /* Adjust the page body layout for smaller screens */
+    .page-body {
+        flex-direction: column;
+    }
+
+    /* Adjust the flex properties for smaller screens */
+    .appointment-user-info,
+    .service-description-and-pay {
+        flex: none; /* reset the flex */
+        width: 100%; /* take full width */
+    }
+
+    /* Remove the margin for service description and pay */
+    .service-description-and-pay {
+        margin-left: 0;
+        margin-bottom: 20px;
+    }
+
+    /* Adjust the grid for name and email for smaller screens */
+    .name-email {
+        grid-template-columns: 1fr; /* stack them vertically */
+    }
+
+    /* Adjust the phone number container */
+    .phone-input-container {
+        flex-direction: column;
+        align-items: stretch; /* make them take full width */
+    }
+
+    .phone-number select,
+    .phone-number input {
+        margin-right: 0;
+        margin-bottom: 10px;
+    }
+
+    /* Adjust the user info input fields */
+    .user-info-input {
+        padding: 20px 10px;
+    }
+
+    /* Adjust the service description content */
+    .service-description-content {
+        grid-template-rows: repeat(3, auto); /* adjust the grid rows */
+    }
+
+    /* Adjust the total layout */
+    .total {
+        flex-direction: column;
+        text-align: center;
+    }
+}
+
+@media only screen and (max-width: 450px) {
+
+    /* Adjust the page body layout for smaller screens */
+    .main-container {
+        width: 97%;
+        margin: 0 !important;
+    }
+}
+
diff --git a/static/css/appointments.css b/static/css/appointments.css
new file mode 100644
index 00000000..aa75c54d
--- /dev/null
+++ b/static/css/appointments.css
@@ -0,0 +1,17 @@
+.fc-scroller {
+    overflow: hidden !important;
+}
+
+@media (max-width: 450px) {
+    .fc-daygrid-day-events {
+        display: none !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        font-size: 0 !important;
+        height: 0 !important;
+    }
+
+    .fc, .fc-button {
+        padding: .3em .45em !important;
+    }
+}
\ No newline at end of file
diff --git a/static/css/appt-common.css b/static/css/appt-common.css
index c0a616fc..d2056b3d 100644
--- a/static/css/appt-common.css
+++ b/static/css/appt-common.css
@@ -1,7 +1,7 @@
 .djangoAppt_main-container {
-
+    margin: 20px auto;
     max-width: 1200px;
-
+    padding: 20px;
     background-color: rgba(248, 249, 250, 0.4);
     border-radius: 5px;
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.1);
@@ -22,7 +22,7 @@
 .djangoAppt_appointment-calendar {
     flex: 3;
     padding: 20px;
-
+    background-color: #fff;
     border-radius: 5px;
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.1);
 }
diff --git a/static/css/thank_you.css b/static/css/thank_you.css
new file mode 100644
index 00000000..de1e61ef
--- /dev/null
+++ b/static/css/thank_you.css
@@ -0,0 +1,66 @@
+/* thank_you.css */
+
+.content-body-apd {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 50px;
+    margin-bottom: 50px;
+}
+
+.main-content {
+    font-family: Arial, sans-serif;
+    line-height: 1.6;
+    padding: 20px;
+    color: #333;
+    max-width: 600px;
+    margin: 0 auto;
+    background-color: #fff;
+    border-radius: 10px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+}
+
+.thank-you-title {
+    font-size: 24px;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom: 20px;
+    color: #007BFF;
+}
+
+.thank-you-message {
+    font-size: 18px;
+    text-align: center;
+    margin-bottom: 10px;
+    color: #333;
+}
+
+.appointment-details-title {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 5px;
+    margin-top: 40px;
+    margin-left: 3px;
+    color: #333;
+}
+
+.appointment-details {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+}
+
+.appointment-details li {
+    font-size: 14px;
+    margin-bottom: 5px;
+    background-color: #f4f4f4;
+    padding: 10px;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.05);
+}
+
+.appointment-details li:last-child {
+    margin-bottom: 0;
+}
diff --git a/static/css/verification_code.css b/static/css/verification_code.css
new file mode 100644
index 00000000..791354a4
--- /dev/null
+++ b/static/css/verification_code.css
@@ -0,0 +1,113 @@
+/* verification_code_v2.css */
+.vcode-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-height: 60vh;
+    padding: 20px;
+}
+
+.vcode-card {
+    background-color: #ffffff;
+    border-radius: 8px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    padding: 40px;
+    width: 100%;
+    max-width: 400px;
+}
+
+.vcode-title {
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+    text-align: center;
+    margin-bottom: 20px;
+}
+
+.vcode-instruction {
+    font-size: 16px;
+    color: #666;
+    text-align: center;
+    margin-bottom: 30px;
+}
+
+.vcode-form {
+    display: flex;
+    flex-direction: column;
+}
+
+.vcode-input-group {
+    margin-bottom: 20px;
+}
+
+.vcode-label {
+    display: block;
+    font-size: 14px;
+    font-weight: 500;
+    color: #333;
+    margin-bottom: 8px;
+}
+
+.vcode-input {
+    width: 100%;
+    padding: 10px;
+    font-size: 16px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    transition: border-color 0.3s ease;
+}
+
+.vcode-input:focus {
+    outline: none;
+    border-color: #4a90e2;
+}
+
+.vcode-button {
+    background-color: #4a90e2;
+    color: #ffffff;
+    font-size: 16px;
+    font-weight: 500;
+    padding: 12px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background-color 0.3s ease;
+}
+
+.vcode-button:hover {
+    background-color: #3a7bc8;
+}
+
+.vcode-alert {
+    margin-top: 20px;
+    padding: 12px;
+    border-radius: 4px;
+    font-size: 14px;
+    text-align: center;
+}
+
+.vcode-alert-error {
+    background-color: #fde8e8;
+    color: #9b1c1c;
+    border: 1px solid #fbd5d5;
+}
+
+.vcode-alert-success {
+    background-color: #e6fffa;
+    color: #046c4e;
+    border: 1px solid #b2f5ea;
+}
+
+@media (max-width: 480px) {
+    .vcode-card {
+        padding: 30px;
+    }
+
+    .vcode-title {
+        font-size: 22px;
+    }
+
+    .vcode-instruction {
+        font-size: 14px;
+    }
+}
diff --git a/static/images/.DS_Store b/static/images/.DS_Store
index 4ef6a7d2..2029b7e6 100644
Binary files a/static/images/.DS_Store and b/static/images/.DS_Store differ
diff --git a/static/images/car_make/.DS_Store b/static/images/car_make/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/static/images/car_make/.DS_Store differ
diff --git a/static/images/car_make/Aston-Martin.png b/static/images/car_make/Aston-Martin.png
index 205f99af..848387f5 100644
Binary files a/static/images/car_make/Aston-Martin.png and b/static/images/car_make/Aston-Martin.png differ
diff --git a/static/images/car_make/BAIC-1.png b/static/images/car_make/BAIC.png
similarity index 100%
rename from static/images/car_make/BAIC-1.png
rename to static/images/car_make/BAIC.png
diff --git a/static/images/car_make/BYD.png b/static/images/car_make/BYD.png
index eca29f2f..2b309f23 100644
Binary files a/static/images/car_make/BYD.png and b/static/images/car_make/BYD.png differ
diff --git a/static/images/car_make/Bentley.png b/static/images/car_make/Bentley.png
new file mode 100644
index 00000000..8934eb1b
Binary files /dev/null and b/static/images/car_make/Bentley.png differ
diff --git a/static/images/car_make/Bugatti.png b/static/images/car_make/Bugatti.png
new file mode 100644
index 00000000..94096ad4
Binary files /dev/null and b/static/images/car_make/Bugatti.png differ
diff --git a/static/images/car_make/Buick.png b/static/images/car_make/Buick.png
new file mode 100644
index 00000000..ef55cbe7
Binary files /dev/null and b/static/images/car_make/Buick.png differ
diff --git a/static/images/car_make/Cadillac.png b/static/images/car_make/Cadillac.png
new file mode 100644
index 00000000..16b6cac0
Binary files /dev/null and b/static/images/car_make/Cadillac.png differ
diff --git a/static/images/car_make/Chevrolet_GxtMDMM.png b/static/images/car_make/Chevrolet_GxtMDMM.png
deleted file mode 100644
index 515dd740..00000000
Binary files a/static/images/car_make/Chevrolet_GxtMDMM.png and /dev/null differ
diff --git a/static/images/car_make/Chrysler.png b/static/images/car_make/Chrysler.png
new file mode 100644
index 00000000..ae432cf0
Binary files /dev/null and b/static/images/car_make/Chrysler.png differ
diff --git a/static/images/car_make/Citroen.png b/static/images/car_make/Citroen.png
deleted file mode 100644
index eb2d3d22..00000000
Binary files a/static/images/car_make/Citroen.png and /dev/null differ
diff --git a/static/images/car_make/Dongfeng-1.png b/static/images/car_make/Dongfeng-1.png
deleted file mode 100644
index fa272b7b..00000000
Binary files a/static/images/car_make/Dongfeng-1.png and /dev/null differ
diff --git a/static/images/car_make/Dongfeng.png b/static/images/car_make/Dongfeng.png
deleted file mode 100644
index 6b22550d..00000000
Binary files a/static/images/car_make/Dongfeng.png and /dev/null differ
diff --git a/static/images/car_make/EXEED.png b/static/images/car_make/EXEED.png
deleted file mode 100644
index c6c40273..00000000
Binary files a/static/images/car_make/EXEED.png and /dev/null differ
diff --git a/static/images/car_make/Ford.png b/static/images/car_make/Ford.png
deleted file mode 100644
index f494aecd..00000000
Binary files a/static/images/car_make/Ford.png and /dev/null differ
diff --git a/static/images/car_make/Forthing.png b/static/images/car_make/Forthing.png
deleted file mode 100644
index 474a02a3..00000000
Binary files a/static/images/car_make/Forthing.png and /dev/null differ
diff --git a/static/images/car_make/Forthing_dE9ZPZJ.png b/static/images/car_make/Forthing_dE9ZPZJ.png
deleted file mode 100644
index a80a9a9b..00000000
Binary files a/static/images/car_make/Forthing_dE9ZPZJ.png and /dev/null differ
diff --git a/static/images/car_make/Forthing_tshW1Xd.png b/static/images/car_make/Forthing_tshW1Xd.png
deleted file mode 100644
index a80a9a9b..00000000
Binary files a/static/images/car_make/Forthing_tshW1Xd.png and /dev/null differ
diff --git a/static/images/car_make/GAC.png b/static/images/car_make/GAC.png
deleted file mode 100644
index c7d6b629..00000000
Binary files a/static/images/car_make/GAC.png and /dev/null differ
diff --git a/static/images/car_make/GMC.png b/static/images/car_make/GMC.png
deleted file mode 100644
index d63c070b..00000000
Binary files a/static/images/car_make/GMC.png and /dev/null differ
diff --git a/static/images/car_make/Geely.png b/static/images/car_make/Geely.png
deleted file mode 100644
index c45f76f0..00000000
Binary files a/static/images/car_make/Geely.png and /dev/null differ
diff --git a/static/images/car_make/Genesis.png b/static/images/car_make/Genesis.png
deleted file mode 100644
index 4c82d0f6..00000000
Binary files a/static/images/car_make/Genesis.png and /dev/null differ
diff --git a/static/images/car_make/Hongqi.png b/static/images/car_make/Hongqi.png
deleted file mode 100644
index a713cdae..00000000
Binary files a/static/images/car_make/Hongqi.png and /dev/null differ
diff --git a/static/images/car_make/JAC.png b/static/images/car_make/JAC.png
deleted file mode 100644
index 534d124b..00000000
Binary files a/static/images/car_make/JAC.png and /dev/null differ
diff --git a/static/images/car_make/JMC.png b/static/images/car_make/JMC.png
deleted file mode 100644
index 4dc084d3..00000000
Binary files a/static/images/car_make/JMC.png and /dev/null differ
diff --git a/static/images/car_make/Jeep.png b/static/images/car_make/Jeep.png
deleted file mode 100644
index 2e4b247e..00000000
Binary files a/static/images/car_make/Jeep.png and /dev/null differ
diff --git a/static/images/car_make/Jeep_qOaP3Rw.png b/static/images/car_make/Jeep_qOaP3Rw.png
deleted file mode 100644
index 2e4b247e..00000000
Binary files a/static/images/car_make/Jeep_qOaP3Rw.png and /dev/null differ
diff --git a/static/images/car_make/Jetour.png b/static/images/car_make/Jetour.png
deleted file mode 100644
index d2daa42d..00000000
Binary files a/static/images/car_make/Jetour.png and /dev/null differ
diff --git a/static/images/car_make/KIA.png b/static/images/car_make/KIA.png
deleted file mode 100644
index 00fb330e..00000000
Binary files a/static/images/car_make/KIA.png and /dev/null differ
diff --git a/static/images/car_make/Lamborghini.png b/static/images/car_make/Lamborghini.png
deleted file mode 100644
index 2c66dbe8..00000000
Binary files a/static/images/car_make/Lamborghini.png and /dev/null differ
diff --git a/static/images/car_make/Land-Rover.png b/static/images/car_make/Land-Rover.png
deleted file mode 100644
index 6560ee14..00000000
Binary files a/static/images/car_make/Land-Rover.png and /dev/null differ
diff --git a/static/images/car_make/Lincoln.png b/static/images/car_make/Lincoln.png
deleted file mode 100644
index 53ff9662..00000000
Binary files a/static/images/car_make/Lincoln.png and /dev/null differ
diff --git a/static/images/car_make/Lincoln_6AdvXuG.png b/static/images/car_make/Lincoln_6AdvXuG.png
deleted file mode 100644
index a8b95d17..00000000
Binary files a/static/images/car_make/Lincoln_6AdvXuG.png and /dev/null differ
diff --git a/static/images/car_make/Lincoln_aAKyhCJ.png b/static/images/car_make/Lincoln_aAKyhCJ.png
deleted file mode 100644
index a8b95d17..00000000
Binary files a/static/images/car_make/Lincoln_aAKyhCJ.png and /dev/null differ
diff --git a/static/images/car_make/Lincoln_mocx6Kj.png b/static/images/car_make/Lincoln_mocx6Kj.png
deleted file mode 100644
index a8b95d17..00000000
Binary files a/static/images/car_make/Lincoln_mocx6Kj.png and /dev/null differ
diff --git a/static/images/car_make/Lucid.png b/static/images/car_make/Lucid.png
deleted file mode 100644
index 85887ca4..00000000
Binary files a/static/images/car_make/Lucid.png and /dev/null differ
diff --git a/static/images/car_make/LynkCo.png b/static/images/car_make/LynkCo.png
deleted file mode 100644
index 2e90a6e2..00000000
Binary files a/static/images/car_make/LynkCo.png and /dev/null differ
diff --git a/static/images/car_make/MG.png b/static/images/car_make/MG.png
deleted file mode 100644
index d4021e0d..00000000
Binary files a/static/images/car_make/MG.png and /dev/null differ
diff --git a/static/images/car_make/Maxus.png b/static/images/car_make/Maxus.png
deleted file mode 100644
index f925e05a..00000000
Binary files a/static/images/car_make/Maxus.png and /dev/null differ
diff --git a/static/images/car_make/Mercedes-Benz.png b/static/images/car_make/Mercedes-Benz.png
deleted file mode 100644
index 14c56556..00000000
Binary files a/static/images/car_make/Mercedes-Benz.png and /dev/null differ
diff --git a/static/images/car_make/Nissan.png b/static/images/car_make/Nissan.png
deleted file mode 100644
index 0eef1db4..00000000
Binary files a/static/images/car_make/Nissan.png and /dev/null differ
diff --git a/static/images/car_make/Peugeot.png b/static/images/car_make/Peugeot.png
deleted file mode 100644
index 0702e75a..00000000
Binary files a/static/images/car_make/Peugeot.png and /dev/null differ
diff --git a/static/images/car_make/Peugeot_S4LPdsy.png b/static/images/car_make/Peugeot_S4LPdsy.png
deleted file mode 100644
index 0702e75a..00000000
Binary files a/static/images/car_make/Peugeot_S4LPdsy.png and /dev/null differ
diff --git a/static/images/car_make/Porsche.png b/static/images/car_make/Porsche.png
deleted file mode 100644
index 42d090bf..00000000
Binary files a/static/images/car_make/Porsche.png and /dev/null differ
diff --git a/static/images/car_make/Rayton-Fissore.png b/static/images/car_make/Rayton-Fissore.png
deleted file mode 100644
index ea6449bc..00000000
Binary files a/static/images/car_make/Rayton-Fissore.png and /dev/null differ
diff --git a/static/images/car_make/Renault.png b/static/images/car_make/Renault.png
deleted file mode 100644
index b130c600..00000000
Binary files a/static/images/car_make/Renault.png and /dev/null differ
diff --git a/static/images/car_make/Rolls-Royce.png b/static/images/car_make/Rolls-Royce.png
deleted file mode 100644
index fa993053..00000000
Binary files a/static/images/car_make/Rolls-Royce.png and /dev/null differ
diff --git a/static/images/car_make/Rover.png b/static/images/car_make/Rover.png
deleted file mode 100644
index 7bb26736..00000000
Binary files a/static/images/car_make/Rover.png and /dev/null differ
diff --git a/static/images/car_make/Rover01.png b/static/images/car_make/Rover01.png
deleted file mode 100644
index 7bb26736..00000000
Binary files a/static/images/car_make/Rover01.png and /dev/null differ
diff --git a/static/images/car_make/Seres.png b/static/images/car_make/Seres.png
deleted file mode 100644
index f7c394fa..00000000
Binary files a/static/images/car_make/Seres.png and /dev/null differ
diff --git a/static/images/car_make/Smart.png b/static/images/car_make/Smart.png
deleted file mode 100644
index bb91aae5..00000000
Binary files a/static/images/car_make/Smart.png and /dev/null differ
diff --git a/static/images/car_make/Ssangyong.png b/static/images/car_make/Ssangyong.png
deleted file mode 100644
index 8b8d2bef..00000000
Binary files a/static/images/car_make/Ssangyong.png and /dev/null differ
diff --git a/static/images/car_make/Stelato.png b/static/images/car_make/Stelato.png
deleted file mode 100644
index 398919c2..00000000
Binary files a/static/images/car_make/Stelato.png and /dev/null differ
diff --git a/static/images/car_make/Subaru.png b/static/images/car_make/Subaru.png
deleted file mode 100644
index 0979df2f..00000000
Binary files a/static/images/car_make/Subaru.png and /dev/null differ
diff --git a/static/images/car_make/Suzuki.png b/static/images/car_make/Suzuki.png
deleted file mode 100644
index 3736bee5..00000000
Binary files a/static/images/car_make/Suzuki.png and /dev/null differ
diff --git a/static/images/car_make/TATA.png b/static/images/car_make/TATA.png
deleted file mode 100644
index 830a1d7c..00000000
Binary files a/static/images/car_make/TATA.png and /dev/null differ
diff --git a/static/images/car_make/Tank.png b/static/images/car_make/Tank.png
deleted file mode 100644
index 44d8ef4e..00000000
Binary files a/static/images/car_make/Tank.png and /dev/null differ
diff --git a/static/images/car_make/Tesla.png b/static/images/car_make/Tesla.png
deleted file mode 100644
index b4245e81..00000000
Binary files a/static/images/car_make/Tesla.png and /dev/null differ
diff --git a/static/images/car_make/Toyota-01.png b/static/images/car_make/Toyota-01.png
deleted file mode 100644
index 9d183bbb..00000000
Binary files a/static/images/car_make/Toyota-01.png and /dev/null differ
diff --git a/static/images/car_make/Volkswagen.png b/static/images/car_make/Volkswagen.png
deleted file mode 100644
index dac34b45..00000000
Binary files a/static/images/car_make/Volkswagen.png and /dev/null differ
diff --git a/static/images/car_make/Volvo.png b/static/images/car_make/Volvo.png
deleted file mode 100644
index 30b6cc9c..00000000
Binary files a/static/images/car_make/Volvo.png and /dev/null differ
diff --git a/static/images/car_make/Voyah.png b/static/images/car_make/Voyah.png
deleted file mode 100644
index b8e0d3b1..00000000
Binary files a/static/images/car_make/Voyah.png and /dev/null differ
diff --git a/static/images/car_make/Zotye.png b/static/images/car_make/Zotye.png
deleted file mode 100644
index c86d94e0..00000000
Binary files a/static/images/car_make/Zotye.png and /dev/null differ
diff --git a/static/images/car_make/haval.png b/static/images/car_make/haval.png
deleted file mode 100644
index c1131c1d..00000000
Binary files a/static/images/car_make/haval.png and /dev/null differ
diff --git a/static/images/car_make/maserati.png b/static/images/car_make/maserati.png
deleted file mode 100644
index 7cb2e6e3..00000000
Binary files a/static/images/car_make/maserati.png and /dev/null differ
diff --git a/static/images/car_make/maserati_Fw9s7lU.png b/static/images/car_make/maserati_Fw9s7lU.png
deleted file mode 100644
index 7cb2e6e3..00000000
Binary files a/static/images/car_make/maserati_Fw9s7lU.png and /dev/null differ
diff --git a/static/images/car_make/zx.png b/static/images/car_make/zx.png
deleted file mode 100644
index 7b125b12..00000000
Binary files a/static/images/car_make/zx.png and /dev/null differ
diff --git a/static/images/icons/30199_outgoing-call.png b/static/images/icons/30199_outgoing-call.png
new file mode 100644
index 00000000..13a91b6e
Binary files /dev/null and b/static/images/icons/30199_outgoing-call.png differ
diff --git a/static/images/icons/311315_test-call.png b/static/images/icons/311315_test-call.png
new file mode 100644
index 00000000..a689e342
Binary files /dev/null and b/static/images/icons/311315_test-call.png differ
diff --git a/static/images/icons/59166_meeting.png b/static/images/icons/59166_meeting.png
new file mode 100644
index 00000000..02f6a62e
Binary files /dev/null and b/static/images/icons/59166_meeting.png differ
diff --git a/static/images/logos/.DS_Store b/static/images/logos/.DS_Store
index 5a705ef9..899b4f32 100644
Binary files a/static/images/logos/.DS_Store and b/static/images/logos/.DS_Store differ
diff --git a/static/images/logos/car_make/.DS_Store b/static/images/logos/car_make/.DS_Store
deleted file mode 100644
index d6e73f23..00000000
Binary files a/static/images/logos/car_make/.DS_Store and /dev/null differ
diff --git a/static/images/logos/car_make/Abarth.png b/static/images/logos/car_make/Abarth.png
deleted file mode 100644
index 4132df76..00000000
Binary files a/static/images/logos/car_make/Abarth.png and /dev/null differ
diff --git a/static/images/logos/car_make/Alfa-Romeo-2.png b/static/images/logos/car_make/Alfa-Romeo-2.png
deleted file mode 100644
index 9c019410..00000000
Binary files a/static/images/logos/car_make/Alfa-Romeo-2.png and /dev/null differ
diff --git a/static/images/logos/car_make/Alfa-Romeo.png b/static/images/logos/car_make/Alfa-Romeo.png
deleted file mode 100644
index c4b9465d..00000000
Binary files a/static/images/logos/car_make/Alfa-Romeo.png and /dev/null differ
diff --git a/static/images/logos/car_make/Audi.webp b/static/images/logos/car_make/Audi.webp
deleted file mode 100644
index dbccb7a5..00000000
Binary files a/static/images/logos/car_make/Audi.webp and /dev/null differ
diff --git a/static/images/logos/car_make/BAIC-1.png b/static/images/logos/car_make/BAIC-1.png
deleted file mode 100644
index cde8f9b5..00000000
Binary files a/static/images/logos/car_make/BAIC-1.png and /dev/null differ
diff --git a/static/images/logos/car_make/BAIC.webp b/static/images/logos/car_make/BAIC.webp
deleted file mode 100644
index 795f106c..00000000
Binary files a/static/images/logos/car_make/BAIC.webp and /dev/null differ
diff --git a/static/images/logos/car_make/BMW.png b/static/images/logos/car_make/BMW.png
deleted file mode 100644
index c9a745a5..00000000
Binary files a/static/images/logos/car_make/BMW.png and /dev/null differ
diff --git a/static/images/logos/car_make/BMW.webp b/static/images/logos/car_make/BMW.webp
deleted file mode 100644
index 49034cac..00000000
Binary files a/static/images/logos/car_make/BMW.webp and /dev/null differ
diff --git a/static/images/logos/car_make/BYD.webp b/static/images/logos/car_make/BYD.webp
deleted file mode 100644
index eca29f2f..00000000
Binary files a/static/images/logos/car_make/BYD.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Bestune.png b/static/images/logos/car_make/Bestune.png
deleted file mode 100644
index 173e4570..00000000
Binary files a/static/images/logos/car_make/Bestune.png and /dev/null differ
diff --git a/static/images/logos/car_make/Bestune.webp b/static/images/logos/car_make/Bestune.webp
deleted file mode 100644
index 2c961304..00000000
Binary files a/static/images/logos/car_make/Bestune.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Changan.webp b/static/images/logos/car_make/Changan.webp
deleted file mode 100644
index 3ee677b3..00000000
Binary files a/static/images/logos/car_make/Changan.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Chery.webp b/static/images/logos/car_make/Chery.webp
deleted file mode 100644
index 0c95c5de..00000000
Binary files a/static/images/logos/car_make/Chery.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Chevrolet.png b/static/images/logos/car_make/Chevrolet.png
deleted file mode 100644
index 515dd740..00000000
Binary files a/static/images/logos/car_make/Chevrolet.png and /dev/null differ
diff --git a/static/images/logos/car_make/Chevrolet.webp b/static/images/logos/car_make/Chevrolet.webp
deleted file mode 100644
index a8fdd220..00000000
Binary files a/static/images/logos/car_make/Chevrolet.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Citroën.png b/static/images/logos/car_make/Citroën.png
deleted file mode 100644
index eb2d3d22..00000000
Binary files a/static/images/logos/car_make/Citroën.png and /dev/null differ
diff --git a/static/images/logos/car_make/Daihatsu.webp b/static/images/logos/car_make/Daihatsu.webp
deleted file mode 100644
index bfe2224e..00000000
Binary files a/static/images/logos/car_make/Daihatsu.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Dongfeng-1.png b/static/images/logos/car_make/Dongfeng-1.png
deleted file mode 100644
index fa272b7b..00000000
Binary files a/static/images/logos/car_make/Dongfeng-1.png and /dev/null differ
diff --git a/static/images/logos/car_make/Dongfeng.png b/static/images/logos/car_make/Dongfeng.png
deleted file mode 100644
index 6b22550d..00000000
Binary files a/static/images/logos/car_make/Dongfeng.png and /dev/null differ
diff --git a/static/images/logos/car_make/EXEED.png b/static/images/logos/car_make/EXEED.png
deleted file mode 100644
index c6c40273..00000000
Binary files a/static/images/logos/car_make/EXEED.png and /dev/null differ
diff --git a/static/images/logos/car_make/Ford.png b/static/images/logos/car_make/Ford.png
deleted file mode 100644
index f494aecd..00000000
Binary files a/static/images/logos/car_make/Ford.png and /dev/null differ
diff --git a/static/images/logos/car_make/Ford.webp b/static/images/logos/car_make/Ford.webp
deleted file mode 100644
index 69d5cd24..00000000
Binary files a/static/images/logos/car_make/Ford.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Ford2.webp b/static/images/logos/car_make/Ford2.webp
deleted file mode 100644
index 60c76bc7..00000000
Binary files a/static/images/logos/car_make/Ford2.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Forthing.png b/static/images/logos/car_make/Forthing.png
deleted file mode 100644
index a80a9a9b..00000000
Binary files a/static/images/logos/car_make/Forthing.png and /dev/null differ
diff --git a/static/images/logos/car_make/Forthing.webp b/static/images/logos/car_make/Forthing.webp
deleted file mode 100644
index 3fe0db0a..00000000
Binary files a/static/images/logos/car_make/Forthing.webp and /dev/null differ
diff --git a/static/images/logos/car_make/GAC.png b/static/images/logos/car_make/GAC.png
deleted file mode 100644
index c7d6b629..00000000
Binary files a/static/images/logos/car_make/GAC.png and /dev/null differ
diff --git a/static/images/logos/car_make/GMC.png b/static/images/logos/car_make/GMC.png
deleted file mode 100644
index d63c070b..00000000
Binary files a/static/images/logos/car_make/GMC.png and /dev/null differ
diff --git a/static/images/logos/car_make/GMC.webp b/static/images/logos/car_make/GMC.webp
deleted file mode 100644
index 0b5fc0c3..00000000
Binary files a/static/images/logos/car_make/GMC.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Geely.png b/static/images/logos/car_make/Geely.png
deleted file mode 100644
index c45f76f0..00000000
Binary files a/static/images/logos/car_make/Geely.png and /dev/null differ
diff --git a/static/images/logos/car_make/Geely.webp b/static/images/logos/car_make/Geely.webp
deleted file mode 100644
index 602fc098..00000000
Binary files a/static/images/logos/car_make/Geely.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Genesis.png b/static/images/logos/car_make/Genesis.png
deleted file mode 100644
index 4c82d0f6..00000000
Binary files a/static/images/logos/car_make/Genesis.png and /dev/null differ
diff --git a/static/images/logos/car_make/Haval.webp b/static/images/logos/car_make/Haval.webp
deleted file mode 100644
index bddd4309..00000000
Binary files a/static/images/logos/car_make/Haval.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Honda.webp b/static/images/logos/car_make/Honda.webp
deleted file mode 100644
index f94c3b98..00000000
Binary files a/static/images/logos/car_make/Honda.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Hongqi.png b/static/images/logos/car_make/Hongqi.png
deleted file mode 100644
index a713cdae..00000000
Binary files a/static/images/logos/car_make/Hongqi.png and /dev/null differ
diff --git a/static/images/logos/car_make/Hongqi.webp b/static/images/logos/car_make/Hongqi.webp
deleted file mode 100644
index 3fc7e4d9..00000000
Binary files a/static/images/logos/car_make/Hongqi.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Hummer.webp b/static/images/logos/car_make/Hummer.webp
deleted file mode 100644
index b74ff948..00000000
Binary files a/static/images/logos/car_make/Hummer.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Hyundai.webp b/static/images/logos/car_make/Hyundai.webp
deleted file mode 100644
index 8f334f12..00000000
Binary files a/static/images/logos/car_make/Hyundai.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Infiniti.webp b/static/images/logos/car_make/Infiniti.webp
deleted file mode 100644
index 13c89b49..00000000
Binary files a/static/images/logos/car_make/Infiniti.webp and /dev/null differ
diff --git a/static/images/logos/car_make/JAC.png b/static/images/logos/car_make/JAC.png
deleted file mode 100644
index 534d124b..00000000
Binary files a/static/images/logos/car_make/JAC.png and /dev/null differ
diff --git a/static/images/logos/car_make/JMC.png b/static/images/logos/car_make/JMC.png
deleted file mode 100644
index 4dc084d3..00000000
Binary files a/static/images/logos/car_make/JMC.png and /dev/null differ
diff --git a/static/images/logos/car_make/Jaguar.webp b/static/images/logos/car_make/Jaguar.webp
deleted file mode 100644
index 78fb1c43..00000000
Binary files a/static/images/logos/car_make/Jaguar.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Jeep.png b/static/images/logos/car_make/Jeep.png
deleted file mode 100644
index 2e4b247e..00000000
Binary files a/static/images/logos/car_make/Jeep.png and /dev/null differ
diff --git a/static/images/logos/car_make/Jeep.webp b/static/images/logos/car_make/Jeep.webp
deleted file mode 100644
index 2abde6b9..00000000
Binary files a/static/images/logos/car_make/Jeep.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Jetour.png b/static/images/logos/car_make/Jetour.png
deleted file mode 100644
index d2daa42d..00000000
Binary files a/static/images/logos/car_make/Jetour.png and /dev/null differ
diff --git a/static/images/logos/car_make/Jetour.webp b/static/images/logos/car_make/Jetour.webp
deleted file mode 100644
index 7b299650..00000000
Binary files a/static/images/logos/car_make/Jetour.webp and /dev/null differ
diff --git a/static/images/logos/car_make/KIA.png b/static/images/logos/car_make/KIA.png
deleted file mode 100644
index 00fb330e..00000000
Binary files a/static/images/logos/car_make/KIA.png and /dev/null differ
diff --git a/static/images/logos/car_make/KIA.webp b/static/images/logos/car_make/KIA.webp
deleted file mode 100644
index 212907c6..00000000
Binary files a/static/images/logos/car_make/KIA.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Lamborghini.png b/static/images/logos/car_make/Lamborghini.png
deleted file mode 100644
index 2c66dbe8..00000000
Binary files a/static/images/logos/car_make/Lamborghini.png and /dev/null differ
diff --git a/static/images/logos/car_make/Land-Rover.png b/static/images/logos/car_make/Land-Rover.png
deleted file mode 100644
index 6560ee14..00000000
Binary files a/static/images/logos/car_make/Land-Rover.png and /dev/null differ
diff --git a/static/images/logos/car_make/Lincoln.png b/static/images/logos/car_make/Lincoln.png
deleted file mode 100644
index a8b95d17..00000000
Binary files a/static/images/logos/car_make/Lincoln.png and /dev/null differ
diff --git a/static/images/logos/car_make/Lincoln.webp b/static/images/logos/car_make/Lincoln.webp
deleted file mode 100644
index 96dd0979..00000000
Binary files a/static/images/logos/car_make/Lincoln.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Lincoln2.webp b/static/images/logos/car_make/Lincoln2.webp
deleted file mode 100644
index 68ec1168..00000000
Binary files a/static/images/logos/car_make/Lincoln2.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Lincoln2_GL3ovHd.webp b/static/images/logos/car_make/Lincoln2_GL3ovHd.webp
deleted file mode 100644
index 68ec1168..00000000
Binary files a/static/images/logos/car_make/Lincoln2_GL3ovHd.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Lucid.png b/static/images/logos/car_make/Lucid.png
deleted file mode 100644
index 85887ca4..00000000
Binary files a/static/images/logos/car_make/Lucid.png and /dev/null differ
diff --git a/static/images/logos/car_make/Lynk&Co.png b/static/images/logos/car_make/Lynk&Co.png
deleted file mode 100644
index 2e90a6e2..00000000
Binary files a/static/images/logos/car_make/Lynk&Co.png and /dev/null differ
diff --git a/static/images/logos/car_make/MG.png b/static/images/logos/car_make/MG.png
deleted file mode 100644
index d4021e0d..00000000
Binary files a/static/images/logos/car_make/MG.png and /dev/null differ
diff --git a/static/images/logos/car_make/MG.webp b/static/images/logos/car_make/MG.webp
deleted file mode 100644
index 96a05cd0..00000000
Binary files a/static/images/logos/car_make/MG.webp and /dev/null differ
diff --git a/static/images/logos/car_make/MG1.webp b/static/images/logos/car_make/MG1.webp
deleted file mode 100644
index 566c7436..00000000
Binary files a/static/images/logos/car_make/MG1.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Maxus.png b/static/images/logos/car_make/Maxus.png
deleted file mode 100644
index f925e05a..00000000
Binary files a/static/images/logos/car_make/Maxus.png and /dev/null differ
diff --git a/static/images/logos/car_make/Maxus.webp b/static/images/logos/car_make/Maxus.webp
deleted file mode 100644
index d2a93321..00000000
Binary files a/static/images/logos/car_make/Maxus.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Mazda.webp b/static/images/logos/car_make/Mazda.webp
deleted file mode 100644
index a102dbb4..00000000
Binary files a/static/images/logos/car_make/Mazda.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Mercedes-Benz.png b/static/images/logos/car_make/Mercedes-Benz.png
deleted file mode 100644
index 14c56556..00000000
Binary files a/static/images/logos/car_make/Mercedes-Benz.png and /dev/null differ
diff --git a/static/images/logos/car_make/Mercedes-Benz.webp b/static/images/logos/car_make/Mercedes-Benz.webp
deleted file mode 100644
index e9b53da0..00000000
Binary files a/static/images/logos/car_make/Mercedes-Benz.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Mitsubishi.webp b/static/images/logos/car_make/Mitsubishi.webp
deleted file mode 100644
index caa34b99..00000000
Binary files a/static/images/logos/car_make/Mitsubishi.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Nissan.png b/static/images/logos/car_make/Nissan.png
deleted file mode 100644
index 0eef1db4..00000000
Binary files a/static/images/logos/car_make/Nissan.png and /dev/null differ
diff --git a/static/images/logos/car_make/Nissan.webp b/static/images/logos/car_make/Nissan.webp
deleted file mode 100644
index d7c76119..00000000
Binary files a/static/images/logos/car_make/Nissan.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Nissan2.webp b/static/images/logos/car_make/Nissan2.webp
deleted file mode 100644
index f5ba3273..00000000
Binary files a/static/images/logos/car_make/Nissan2.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Peugeot.png b/static/images/logos/car_make/Peugeot.png
deleted file mode 100644
index 0702e75a..00000000
Binary files a/static/images/logos/car_make/Peugeot.png and /dev/null differ
diff --git a/static/images/logos/car_make/Peugeot.webp b/static/images/logos/car_make/Peugeot.webp
deleted file mode 100644
index 42732422..00000000
Binary files a/static/images/logos/car_make/Peugeot.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Porsche.png b/static/images/logos/car_make/Porsche.png
deleted file mode 100644
index 42d090bf..00000000
Binary files a/static/images/logos/car_make/Porsche.png and /dev/null differ
diff --git a/static/images/logos/car_make/Porsche.webp b/static/images/logos/car_make/Porsche.webp
deleted file mode 100644
index a7e1fa00..00000000
Binary files a/static/images/logos/car_make/Porsche.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Porsche2.webp b/static/images/logos/car_make/Porsche2.webp
deleted file mode 100644
index a5f09a5f..00000000
Binary files a/static/images/logos/car_make/Porsche2.webp and /dev/null differ
diff --git a/static/images/logos/car_make/RangeRover.webp b/static/images/logos/car_make/RangeRover.webp
deleted file mode 100644
index 5a2a0b2f..00000000
Binary files a/static/images/logos/car_make/RangeRover.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Rayton-Fissore.png b/static/images/logos/car_make/Rayton-Fissore.png
deleted file mode 100644
index ea6449bc..00000000
Binary files a/static/images/logos/car_make/Rayton-Fissore.png and /dev/null differ
diff --git a/static/images/logos/car_make/Renault.png b/static/images/logos/car_make/Renault.png
deleted file mode 100644
index b130c600..00000000
Binary files a/static/images/logos/car_make/Renault.png and /dev/null differ
diff --git a/static/images/logos/car_make/Renault.webp b/static/images/logos/car_make/Renault.webp
deleted file mode 100644
index b280e364..00000000
Binary files a/static/images/logos/car_make/Renault.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Rolls-Royce.png b/static/images/logos/car_make/Rolls-Royce.png
deleted file mode 100644
index fa993053..00000000
Binary files a/static/images/logos/car_make/Rolls-Royce.png and /dev/null differ
diff --git a/static/images/logos/car_make/Rover.png b/static/images/logos/car_make/Rover.png
deleted file mode 100644
index 7bb26736..00000000
Binary files a/static/images/logos/car_make/Rover.png and /dev/null differ
diff --git a/static/images/logos/car_make/Rover.webp b/static/images/logos/car_make/Rover.webp
deleted file mode 100644
index bc5fb9d5..00000000
Binary files a/static/images/logos/car_make/Rover.webp and /dev/null differ
diff --git a/static/images/logos/car_make/SWM.png b/static/images/logos/car_make/SWM.png
deleted file mode 100644
index a12e8a33..00000000
Binary files a/static/images/logos/car_make/SWM.png and /dev/null differ
diff --git a/static/images/logos/car_make/SWM.webp b/static/images/logos/car_make/SWM.webp
deleted file mode 100644
index cf46c109..00000000
Binary files a/static/images/logos/car_make/SWM.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Saab.png b/static/images/logos/car_make/Saab.png
deleted file mode 100644
index e7576c56..00000000
Binary files a/static/images/logos/car_make/Saab.png and /dev/null differ
diff --git a/static/images/logos/car_make/Seres.png b/static/images/logos/car_make/Seres.png
deleted file mode 100644
index f7c394fa..00000000
Binary files a/static/images/logos/car_make/Seres.png and /dev/null differ
diff --git a/static/images/logos/car_make/Seres.webp b/static/images/logos/car_make/Seres.webp
deleted file mode 100644
index eee52f23..00000000
Binary files a/static/images/logos/car_make/Seres.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Smart.png b/static/images/logos/car_make/Smart.png
deleted file mode 100644
index bb91aae5..00000000
Binary files a/static/images/logos/car_make/Smart.png and /dev/null differ
diff --git a/static/images/logos/car_make/Smart.webp b/static/images/logos/car_make/Smart.webp
deleted file mode 100644
index d599fd9f..00000000
Binary files a/static/images/logos/car_make/Smart.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Ssangyong.png b/static/images/logos/car_make/Ssangyong.png
deleted file mode 100644
index 8b8d2bef..00000000
Binary files a/static/images/logos/car_make/Ssangyong.png and /dev/null differ
diff --git a/static/images/logos/car_make/Stelato.png b/static/images/logos/car_make/Stelato.png
deleted file mode 100644
index 398919c2..00000000
Binary files a/static/images/logos/car_make/Stelato.png and /dev/null differ
diff --git a/static/images/logos/car_make/Subaru.png b/static/images/logos/car_make/Subaru.png
deleted file mode 100644
index 0979df2f..00000000
Binary files a/static/images/logos/car_make/Subaru.png and /dev/null differ
diff --git a/static/images/logos/car_make/Suzuki.png b/static/images/logos/car_make/Suzuki.png
deleted file mode 100644
index 3736bee5..00000000
Binary files a/static/images/logos/car_make/Suzuki.png and /dev/null differ
diff --git a/static/images/logos/car_make/Suzuki.webp b/static/images/logos/car_make/Suzuki.webp
deleted file mode 100644
index 486cd452..00000000
Binary files a/static/images/logos/car_make/Suzuki.webp and /dev/null differ
diff --git a/static/images/logos/car_make/TATA.png b/static/images/logos/car_make/TATA.png
deleted file mode 100644
index 830a1d7c..00000000
Binary files a/static/images/logos/car_make/TATA.png and /dev/null differ
diff --git a/static/images/logos/car_make/Tank.png b/static/images/logos/car_make/Tank.png
deleted file mode 100644
index 44d8ef4e..00000000
Binary files a/static/images/logos/car_make/Tank.png and /dev/null differ
diff --git a/static/images/logos/car_make/Tank.webp b/static/images/logos/car_make/Tank.webp
deleted file mode 100644
index 8c7222e6..00000000
Binary files a/static/images/logos/car_make/Tank.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Tesla.png b/static/images/logos/car_make/Tesla.png
deleted file mode 100644
index b4245e81..00000000
Binary files a/static/images/logos/car_make/Tesla.png and /dev/null differ
diff --git a/static/images/logos/car_make/Tesla.webp b/static/images/logos/car_make/Tesla.webp
deleted file mode 100644
index 84f360ec..00000000
Binary files a/static/images/logos/car_make/Tesla.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Toyota-01.png b/static/images/logos/car_make/Toyota-01.png
deleted file mode 100644
index 9d183bbb..00000000
Binary files a/static/images/logos/car_make/Toyota-01.png and /dev/null differ
diff --git a/static/images/logos/car_make/Toyota.png b/static/images/logos/car_make/Toyota.png
deleted file mode 100644
index 2220f0f0..00000000
Binary files a/static/images/logos/car_make/Toyota.png and /dev/null differ
diff --git a/static/images/logos/car_make/Toyota.webp b/static/images/logos/car_make/Toyota.webp
deleted file mode 100644
index ddb64706..00000000
Binary files a/static/images/logos/car_make/Toyota.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Toyota2.webp b/static/images/logos/car_make/Toyota2.webp
deleted file mode 100644
index 37f60c0a..00000000
Binary files a/static/images/logos/car_make/Toyota2.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Volkswagen.png b/static/images/logos/car_make/Volkswagen.png
deleted file mode 100644
index dac34b45..00000000
Binary files a/static/images/logos/car_make/Volkswagen.png and /dev/null differ
diff --git a/static/images/logos/car_make/Volkswagen.webp b/static/images/logos/car_make/Volkswagen.webp
deleted file mode 100644
index f7e28175..00000000
Binary files a/static/images/logos/car_make/Volkswagen.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Volkswagen2.webp b/static/images/logos/car_make/Volkswagen2.webp
deleted file mode 100644
index a614069c..00000000
Binary files a/static/images/logos/car_make/Volkswagen2.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Volvo.png b/static/images/logos/car_make/Volvo.png
deleted file mode 100644
index 30b6cc9c..00000000
Binary files a/static/images/logos/car_make/Volvo.png and /dev/null differ
diff --git a/static/images/logos/car_make/Voyah.png b/static/images/logos/car_make/Voyah.png
deleted file mode 100644
index b8e0d3b1..00000000
Binary files a/static/images/logos/car_make/Voyah.png and /dev/null differ
diff --git a/static/images/logos/car_make/Voyah.webp b/static/images/logos/car_make/Voyah.webp
deleted file mode 100644
index 0b837b44..00000000
Binary files a/static/images/logos/car_make/Voyah.webp and /dev/null differ
diff --git a/static/images/logos/car_make/Zotye.png b/static/images/logos/car_make/Zotye.png
deleted file mode 100644
index c86d94e0..00000000
Binary files a/static/images/logos/car_make/Zotye.png and /dev/null differ
diff --git a/static/images/logos/car_make/changan.png b/static/images/logos/car_make/changan.png
deleted file mode 100644
index 5761674e..00000000
Binary files a/static/images/logos/car_make/changan.png and /dev/null differ
diff --git a/static/images/logos/car_make/convertible.svg b/static/images/logos/car_make/convertible.svg
deleted file mode 100644
index 277ed941..00000000
--- a/static/images/logos/car_make/convertible.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="164" height="80" fill="none"><path d="M76.814 34.668h-1.739c-.773 0-1.417-.522-1.546-1.306l-.966-4.701c-.193-.979.515-1.959 1.546-1.959h.258c1.61 0 3.027 1.175 3.414 2.808l.644 3.2c.193.98-.58 1.959-1.61 1.959zm-21.129.849h-1.739c-.773 0-1.417-.522-1.546-1.306l-.966-4.701c-.193-.98.515-1.959 1.546-1.959h.258c1.61 0 3.027 1.175 3.414 2.808l.644 3.2c.129 1.045-.58 1.959-1.61 1.959z" fill="#ca8e59"/><path d="M141.87 41.85l-.386-.131s-.258-3.918-2.577-4.832c-8.374-3.787-21.385-5.224-35.427-6.007l-8.76-4.44c-4.122-2.09-8.438-3.591-12.947-4.44-.451.392-.837.784-1.16 1.11l-.129.131c4.573.718 9.018 2.155 13.334 4.375l8.631 5.159-47.729-1.633c.322-1.306-.644-2.547-1.932-2.547H41.515l-1.804 1.306-12.367.588c-1.095.065-2.126.588-2.77 1.436l-.322.392c.515 1.502.322 3.2-.644 5.158l-2.19 2.351c0 3.265 1.868 6.203 4.702 7.574l9.662 4.571 6.892 1.175 89.856.718 5.669-1.045c2.705-.522 4.702-2.873 4.702-5.681v-3.983c-.065-.588-.451-1.11-1.031-1.306z" fill="#e3e3e3"/><path d="M123.706 34.211c-7.471-1.175-16.811-1.437-16.811-1.437l-64.8-2.089-13.398.457c-1.159.065-2.254.588-2.963 1.437.129.588.129 1.241.129 1.894 4.058-.261 8.052-.196 11.916 1.698 2.19 1.045 4.767 2.612 6.248 4.767.129.065.258.131.451.196h.129v-1.371c21.256-1.502 46.055-1.175 79.293 0v3.33l14.557-3.918c.386-1.045-7.279-3.787-14.751-4.962zM112.37 44.397l-36.716-.522a13.29 13.29 0 0 0-4.444.784l-9.984 3.591c-.322.131-.322 1.045 0 1.045l47.537-.457c1.417 0 2.834-1.698 3.607-4.44z" fill="#fff"/><path d="M93.756 27.616c-3.865-1.959-7.794-3.33-11.852-4.114.451.849-.837 1.437-.837 1.567l.386.588c3.414.588 6.699 1.698 9.855 3.33l6.055 3.591 5.088.196-8.695-5.158z" fill="#3c3c3c"/><path d="M110.051 51.122c0-.653.064-1.241.128-1.894.902-7.117 5.669-11.688 12.175-11.688 6.183 0 10.756 4.179 11.594 10.709.129.98.129 1.959.129 2.938h-24.026v-.065zm-75.492.066c.258-8.162 5.797-14.365 12.883-14.365 6.312 0 11.465 5.224 11.465 11.623v.914 1.828H34.559z" fill="#e3e3e3"/><g fill="#d8d8d8"><path d="M104.447 50.731l-.644-.131a70.65 70.65 0 0 0 .773-13.778c-.837-1.828-1.675-3.069-3.478-4.114l.322-.588c1.932 1.175 2.898 2.612 3.736 4.506v.131c.322 4.571.064 9.272-.709 13.974z"/><path d="M111.277 51.318L71.664 50.6l-.064-.131c-.065-.065-5.668-8.489-4.123-18.805l.644.065c-1.353 9.337 3.221 17.043 3.929 18.153l39.292.653-.065.784zm-72.144-7.052l-4.767-4.44a7.23 7.23 0 0 0-5.024-2.024h-5.733v-.653h5.733c2.061 0 3.994.784 5.475 2.155l4.767 4.44-.451.522zm92.175 2.416l-.257-.588 1.868-.784c1.546-.653 3.156-.98 4.831-.98h5.153v.653h-5.153c-1.546 0-3.092.327-4.574.914l-1.868.784z"/></g><path d="M24.767 32.905h-.386c.258 1.371 0 2.873-.837 4.571l-.129.131h4.831c.709-2.351-1.031-4.701-3.478-4.701z" fill="#ae0018"/><path d="M24.314 35.647c-.129.588-.386 1.175-.709 1.828l-.129.131h4.831c.193-.653.193-1.371 0-1.959h-3.994z" fill="#ff8840"/><path d="M138.717 41.393h2.77c-.064-.718-.451-2.742-1.61-3.853h-3.607c-.645 0-1.096.718-.709 1.306l.644 1.11c.451.914 1.417 1.437 2.512 1.437z" fill="#c4f5f5"/><path d="M135.495 38.847h5.217c-.258-.457-.515-.98-.902-1.306h-3.607c-.644 0-1.03.718-.708 1.306z" fill="#fff"/><path d="M138.395 41.263c-.258-1.241-.58-2.873-1.61-3.722h-.515c-.645 0-1.096.718-.709 1.306l.644 1.11c.515.849 1.353 1.371 2.255 1.437-.065-.065-.065-.131-.065-.131z" fill="#ff8840"/><path d="M111.597 53.734c-.258-1.371-.322-2.873-.129-4.375.773-6.138 4.831-10.513 10.886-10.513 5.217 0 9.533 3.395 10.306 9.533.257 1.828.129 3.722-.258 5.485l-20.805-.131zm-75.812-1.763c0-.196.064-.457.064-.718.193-7.77 5.475-13.125 11.594-13.125 5.604 0 10.177 4.636 10.177 10.317 0 1.763.065 3.395-.193 4.767l-14.751-.065-6.892-1.175z" fill="#1d0000"/><path d="M47.438 57.391c4.874 0 8.825-4.005 8.825-8.946S52.312 39.5 47.438 39.5s-8.825 4.005-8.825 8.946 3.951 8.946 8.825 8.946z" fill="#736e68"/><g fill="#3c3c3c"><path d="M56.262 48.445c0 4.962-3.929 9.011-8.824 9.011s-8.825-3.983-8.825-8.946h17.649v-.065z"/><path d="M54.865 50.226c.973-4.176-1.578-8.361-5.698-9.348s-8.248 1.6-9.221 5.776 1.578 8.362 5.698 9.348 8.248-1.6 9.221-5.776z"/><path d="M55.104 48.38v.065c0 4.31-3.414 7.77-7.665 7.77s-7.665-3.461-7.665-7.77v-.065h15.33z"/></g><path d="M47.442 54.714c3.415 0 6.184-2.806 6.184-6.269s-2.769-6.268-6.184-6.268-6.184 2.807-6.184 6.268 2.768 6.269 6.184 6.269z" fill="#c4ccd9"/><path d="M47.44 42.177c3.414 0 6.184 2.808 6.184 6.268H41.191c0-3.461 2.77-6.268 6.248-6.268z" fill="#b0abab"/><path d="M51.175 48.445c0 2.09-1.675 3.852-3.8 3.852-2.061 0-3.8-1.698-3.8-3.852 0-2.09 1.675-3.852 3.8-3.852 2.126.065 3.8 1.763 3.8 3.852z" fill="#565657"/><path d="M122.293 57.391c4.874 0 8.825-4.005 8.825-8.946s-3.951-8.946-8.825-8.946-8.824 4.005-8.824 8.946 3.951 8.946 8.824 8.946z" fill="#736e68"/><g fill="#3c3c3c"><path d="M131.118 48.445c0 4.962-3.929 9.011-8.825 9.011s-8.824-3.983-8.824-8.946h17.649v-.065z"/><path d="M129.72 50.226c.973-4.176-1.578-8.361-5.698-9.348s-8.249 1.6-9.221 5.776 1.578 8.362 5.698 9.348 8.248-1.6 9.221-5.776z"/><path d="M129.959 48.38v.065c0 4.31-3.414 7.77-7.665 7.77s-7.665-3.461-7.665-7.77v-.065h15.33z"/></g><path d="M122.297 54.714c3.415 0 6.184-2.806 6.184-6.269s-2.769-6.268-6.184-6.268-6.184 2.807-6.184 6.268 2.769 6.269 6.184 6.269z" fill="#c4ccd9"/><path d="M122.295 42.177c3.414 0 6.184 2.808 6.184 6.268h-12.432c0-3.461 2.77-6.268 6.248-6.268z" fill="#b0abab"/><path d="M126.03 48.445c0 2.09-1.674 3.852-3.8 3.852-2.061 0-3.8-1.698-3.8-3.852 0-2.09 1.674-3.852 3.8-3.852 2.126.065 3.8 1.763 3.8 3.852z" fill="#565657"/><path d="M94.207 31.925l6.055.196-5.089-3.004-.966 2.808zm-24.609 4.244c.193.653 1.095 1.175 2.19 1.241s2.061-.392 2.319-1.045l-4.509-.196z" fill="#e3e3e3"/><path d="M69.66 35.19c.258-.653 1.224-1.11 2.319-1.045s1.997.588 2.19 1.241l-4.509-.196z" fill="#d8d8d8"/><path d="M91.498 31.925h2.512c.387 0 .644-.653.644-1.437 0-.718-.258-1.371-.58-1.437l-2.641-.914v3.787h.064z" fill="#e3e3e3"/><path d="M94.654 30.227c-.064-.653-.258-1.11-.58-1.241l-2.641-.914v2.089h3.221v.065z" fill="#fff"/><path d="M139.164 47.988c0 .979.515 1.828 1.095 1.828s1.095-.784 1.095-1.828c0-.98-.515-1.828-1.095-1.828-.644 0-1.095.784-1.095 1.828z" fill="#1d0000"/></svg>
\ No newline at end of file
diff --git a/static/images/logos/car_make/coupe.svg b/static/images/logos/car_make/coupe.svg
deleted file mode 100644
index 8097cff5..00000000
--- a/static/images/logos/car_make/coupe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="164" height="80" fill="none"><path d="M73.644 33.987h-1.756c-.787 0-1.393-.538-1.575-1.255l-.969-4.662c-.182-.956.545-1.913 1.575-1.913h.242c1.635 0 3.088 1.136 3.452 2.749l.666 3.168c.182.956-.606 1.913-1.635 1.913z" fill="#d39a66"/><path d="M58.505 35.421h-1.756c-.787 0-1.393-.538-1.575-1.255l-.969-4.662c-.182-.956.545-1.913 1.575-1.913h.242c1.635 0 3.089 1.136 3.452 2.749l.666 3.168c.121 1.016-.666 1.913-1.635 1.913z" fill="#613800"/><path d="M142.135 40.382s-.302-3.825-2.604-4.722c-8.478-3.766-21.619-5.14-35.911-5.917l-8.841-4.363C87.694 21.793 79.942 20 72.13 20h-2.483a59.75 59.75 0 0 0-20.226 3.526l-7.449 5.2-15.503.598c-1.09.06-2.12.538-2.846 1.435l-.303.359c.484 1.494.303 3.168-.666 5.081l-2.18 2.331c0 3.168 1.877 6.097 4.784 7.471l9.81 4.483 6.964 1.136 91.019.717 5.692-1.016c2.786-.478 4.784-2.869 4.784-5.619v-3.885c0-.598-.363-1.136-.969-1.315l-.424-.12zm-87.93-10.46s2.059-8.308 14.352-8.308l4.057-.06c7.509 0 14.473 1.494 21.135 4.901l8.781 5.081-48.325-1.614z" fill="#e3e3e3"/><path d="M87.455 22.391C82.247 20.658 76.796 20 72.133 20H69.65a59.75 59.75 0 0 0-20.226 3.526l-7.449 5.2 12.233 1.195c.06-.239 2.241-8.308 14.352-8.308l4.057-.06c4.602 0 9.023.598 13.262 1.793l1.575-.956z" fill="#d39a66"/><path d="M49.424 23.527l-7.449 5.2 12.233 1.195c0-.119.545-2.092 2.483-4.064-.787-.359-6.964-2.451-7.267-2.331z" fill="#b3815c"/><path d="M124.086 32.971c-7.57-1.136-17.017-1.434-17.017-1.434l-65.645-2.092-13.565.478c-1.151.06-2.241.538-3.028 1.435.121.598.182 1.255.121 1.853 4.118-.239 8.175-.179 12.051 1.674 2.241 1.016 4.845 2.57 6.359 4.722.121.06.303.119.424.179h.182v-1.255c21.559-1.434 46.69-1.136 80.36 0v3.287l14.776-3.885c.364-1.076-7.388-3.825-15.018-4.961zm-62.8 12.193l33.428.478c1.332 0 2.664.179 3.997.418l8.902 1.733c.303.06.242.478-.06.478l-43.178-1.136c-1.332 0-2.543-.777-3.089-1.973z" fill="#fff"/><path d="M68.557 21.614l4.057-.06c7.509 0 14.473 1.494 21.135 4.901l8.781 5.081-6.904-.179-6.116-3.586c-5.268-2.63-10.779-3.825-16.653-3.825l-2.725.06c-5.571.359-10.295 6.097-10.295 6.097l-5.571-.179c-.061 0 1.998-8.308 14.292-8.308z" fill="#404752"/><path d="M110.279 49.647c0-.598.06-1.255.121-1.853.908-6.993 5.753-11.536 12.293-11.536 6.298 0 10.901 4.124 11.748 10.52.122.956.182 1.913.122 2.869h-24.284zm-76.484.06c.242-8.069 5.814-14.166 13.02-14.166 6.419 0 11.627 5.14 11.627 11.476v.897 1.853H33.795v-.06z" fill="#e3e3e3"/><g fill="#d8d8d8"><path d="M104.588 49.228l-.606-.12c.727-4.543.969-9.085.727-13.568-.848-1.793-1.696-3.048-3.512-4.065l.302-.538c1.999 1.136 2.907 2.57 3.816 4.423v.12c.302 4.543.06 9.145-.727 13.748z"/><path d="M111.553 49.826l-40.15-.657-.061-.179c-.061-.06-5.753-8.368-4.178-18.529l.606.06c-1.393 9.205 3.331 16.915 3.997 17.991l39.848.657-.061.657z"/></g><path d="M38.398 42.893l-4.845-4.423c-1.393-1.255-3.21-1.972-5.087-1.972h-5.814V35.9h5.814c2.059 0 3.997.777 5.511 2.152l4.845 4.423-.424.418zm93.442 2.331l-.242-.538 1.877-.777a12.51 12.51 0 0 1 4.845-.956h5.208v.598h-5.208a12.13 12.13 0 0 0-4.602.897l-1.878.777z" fill="#e3e3e3"/><path d="M23.862 31.656h-.363c.303 1.315 0 2.809-.848 4.483l-.121.179h4.845c.727-2.331-1.029-4.662-3.512-4.662z" fill="#d10018"/><path d="M23.378 34.405c-.182.598-.363 1.195-.727 1.793l-.121.179h4.845c.182-.657.182-1.315.061-1.972h-4.057z" fill="#ff1418"/><path d="M139.35 40.083h2.785c-.121-.717-.484-2.69-1.635-3.825h-3.633c-.666 0-1.09.717-.727 1.315l.666 1.076c.485.837 1.454 1.435 2.544 1.435z" fill="#c4f5f5"/><path d="M136.077 37.573h5.268c-.242-.478-.545-.956-.908-1.315h-3.633c-.667 0-1.09.717-.727 1.315z" fill="#fff"/><path d="M138.984 39.904c-.243-1.195-.606-2.809-1.635-3.646h-.545c-.667 0-1.09.717-.727 1.315l.666 1.076c.485.837 1.332 1.315 2.301 1.435-.06-.12-.06-.12-.06-.179z" fill="#ff8840"/><path d="M108.827 37.334h5.027a1.08 1.08 0 0 0 .969-.598l.181-.359c.121-.299-.06-.657-.424-.657l-7.267-.179.424 1.016c.182.478.606.777 1.09.777z" fill="#4a2c2c"/><path d="M111.854 52.217a14.54 14.54 0 0 1-.122-4.304c.788-6.097 4.906-10.4 11.022-10.4 5.329 0 9.629 3.347 10.477 9.384.242 1.793.121 3.706-.243 5.439l-21.134-.119zm-76.786-1.733c0-.239.061-.478.061-.717.242-7.651 5.511-12.911 11.748-12.911 5.692 0 10.295 4.543 10.295 10.161 0 1.733.061 3.347-.182 4.722l-14.958-.12-6.964-1.136z" fill="#1d0000"/><path d="M55.543 49.044c1.13-4.757-1.861-9.517-6.68-10.632s-9.642 1.836-10.772 6.593 1.861 9.517 6.68 10.632 9.642-1.836 10.772-6.593z" fill="#736e68"/><g fill="#3c3c3c"><path d="M55.777 47.017c0 4.901-3.997 8.846-8.963 8.846s-8.963-3.945-8.963-8.846h17.925z"/><path d="M46.814 54.727c4.314 0 7.812-3.452 7.812-7.711s-3.498-7.711-7.812-7.711-7.812 3.452-7.812 7.711 3.498 7.711 7.812 7.711z"/><path d="M54.626 46.957v.12c0 4.244-3.512 7.711-7.812 7.711s-7.812-3.467-7.812-7.711v-.12h15.624z"/></g><path d="M52.972 48.339c.735-3.356-1.426-6.664-4.826-7.389s-6.751 1.407-7.486 4.763 1.426 6.664 4.826 7.389 6.751-1.407 7.486-4.763z" fill="#c4ccd9"/><path d="M46.814 40.801c3.452 0 6.298 2.809 6.298 6.216H40.516c0-3.407 2.846-6.216 6.298-6.216z" fill="#b0abab"/><path d="M50.63 47.017c0 2.092-1.696 3.766-3.815 3.766s-3.815-1.674-3.815-3.766 1.696-3.766 3.815-3.766 3.815 1.674 3.815 3.766z" fill="#565657"/><path d="M129.085 53.261c3.501-3.455 3.501-9.056 0-12.51a9.05 9.05 0 0 0-12.674 0c-3.501 3.455-3.501 9.056 0 12.51a9.05 9.05 0 0 0 12.674 0z" fill="#736e68"/><g fill="#3c3c3c"><path d="M131.723 47.017c0 4.901-3.997 8.846-8.963 8.846s-8.962-3.945-8.962-8.846h17.925z"/><path d="M122.756 54.727c4.315 0 7.812-3.452 7.812-7.711s-3.497-7.711-7.812-7.711-7.812 3.452-7.812 7.711 3.498 7.711 7.812 7.711z"/><path d="M130.508 46.957v.12c0 4.244-3.513 7.71-7.812 7.71s-7.752-3.526-7.752-7.77v-.12h15.564v.06z"/></g><path d="M127.201 51.401a6.16 6.16 0 0 0 0-8.791 6.36 6.36 0 0 0-8.907 0 6.16 6.16 0 0 0 0 8.791 6.36 6.36 0 0 0 8.907 0z" fill="#c4ccd9"/><path d="M122.753 40.801c3.452 0 6.298 2.809 6.298 6.216h-12.596c0-3.407 2.785-6.216 6.298-6.216z" fill="#b0abab"/><path d="M122.757 50.783c2.107 0 3.815-1.686 3.815-3.766s-1.708-3.766-3.815-3.766-3.815 1.686-3.815 3.766 1.708 3.766 3.815 3.766z" fill="#565657"/><path d="M140.499 48.75c.666 0 1.211-.538 1.211-1.196v-.777c0-.538-.424-1.016-.969-1.136l-1.998-.299c-.666-.12-1.211.359-1.09.837l.181.837c.243.956 1.393 1.733 2.665 1.733z" fill="#4a2c2c"/><path d="M94.234 30.699l6.116.239-5.147-2.989-.969 2.75z" fill="#777f7c"/><path d="M68.74 21.614l1.211-.06-1.453 8.846-2.301-.06 2.543-8.727z" fill="#404752"/><path d="M69.285 34.943c.182.657 1.151 1.195 2.241 1.195 1.151.06 2.059-.418 2.362-1.016l-4.602-.179z" fill="#e3e3e3"/><path d="M69.348 33.927c.242-.657 1.211-1.076 2.362-1.016s2.059.538 2.241 1.195l-4.602-.179z" fill="#777f7c"/><path d="M91.087 30.699h3.815c.545 0 1.029-.418 1.029-1.016a.97.97 0 0 0-.848-.956l-3.997-.598v2.57z" fill="#fff"/><path d="M95.931 29.563c-.061-.418-.424-.777-.848-.837l-3.997-.598v1.435h4.845z" fill="#dbffd6"/><path d="M140.016 47.196c0 .658.303 1.136.727 1.136.363 0 .726-.538.726-1.136s-.302-1.136-.726-1.136-.727.538-.727 1.136z" fill="#c4f5f5"/></svg>
\ No newline at end of file
diff --git a/static/images/logos/car_make/haval.png b/static/images/logos/car_make/haval.png
deleted file mode 100644
index c1131c1d..00000000
Binary files a/static/images/logos/car_make/haval.png and /dev/null differ
diff --git a/static/images/logos/car_make/maserati.png b/static/images/logos/car_make/maserati.png
deleted file mode 100644
index 7cb2e6e3..00000000
Binary files a/static/images/logos/car_make/maserati.png and /dev/null differ
diff --git a/static/images/logos/car_make/sedan.svg b/static/images/logos/car_make/sedan.svg
deleted file mode 100644
index b560e504..00000000
--- a/static/images/logos/car_make/sedan.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="164" height="80" fill="none"><path d="M78.545 35.813h-1.738c-.772 0-1.416-.509-1.545-1.273l-.966-4.583c-.193-.955.515-1.91 1.545-1.91h.257c1.609 0 3.026 1.146 3.412 2.737l.644 3.119c.193 1.018-.579 1.91-1.609 1.91zm-21.116 1.464h-1.738c-.773 0-1.416-.509-1.545-1.273l-.966-4.583c-.193-.955.515-1.91 1.545-1.91h.258c1.609 0 3.026 1.146 3.412 2.737l.644 3.119c.129.955-.579 1.91-1.609 1.91z" fill="#ca8e59"/><path d="M144.079 39.696a43.49 43.49 0 0 0-15.128-4.901l-23.69-3.247-8.69-4.329A50.45 50.45 0 0 0 74.233 22h-5.794c-6.759 0-13.519 1.209-19.892 3.501l-12.682 4.583-11.716 1.146-1.352 1.719c.515 1.464.322 3.119-.644 5.029l-2.189 2.292v5.156l2.317 4.647 18.926 3.183 94.244.7 10.365-1.846v-9.548c-.065-1.209-.709-2.292-1.739-2.864zm-95.274-7.893l-1.352-2.355c-.386-.7-.064-1.655.708-1.91l1.288-.446c6.116-2.228 12.103-2.992 19.119-3.374l6.244-.064c7.403 0 14.291 1.464 20.857 4.838l8.626 5.029-55.491-1.719z" fill="#e3e3e3"/><path d="M126.763 40.269c-33.217-1.146-62.508-1.464-83.752 0v1.337l-19.055-1.082c-.901-.064-1.352-1.146-.708-1.782l.064-.191c.966-1.91 1.288-3.692.901-5.283l1.159-1.337 10.751-.573 68.173 2.037 24.462 2.674c5.15.7 10.107 2.292 14.678 4.774.644.318 1.03 1.018 1.03 1.719 0 .509-.451.955-.966.955h-16.673v-3.246h-.064zm-66.5 6.62l36.307.509c1.287 0 2.639.127 3.926.382l8.755 1.719c.258.064.258.446-.064.446l-45.963-1.082c-1.288-.064-2.446-.828-2.961-1.973z" fill="#fff"/><path d="M48.159 27.474l1.287-.446c6.116-2.228 12.103-2.992 19.119-3.374l6.244-.064c7.403 0 14.291 1.464 20.857 4.838l8.626 5.029-6.824-.191-6.051-3.501c-5.214-2.61-10.622-3.819-16.415-3.819l-4.892.064c-5.536.255-10.236.828-15.064 2.61l-1.03.382c-.644.255-.901.955-.579 1.528l.837 1.464-5.472-.127-1.352-2.355c-.451-.827-.129-1.719.708-2.037z" fill="#404752"/><path d="M113.052 51.282c0-.636.065-1.209.129-1.846.901-6.938 5.665-11.394 12.167-11.394 6.18 0 10.75 4.074 11.587 10.44.129.955.129 1.91.129 2.864h-24.012v-.064zm-79.952.127c.258-7.957 5.794-14.004 12.875-14.004 6.309 0 11.459 5.092 11.459 11.331v.891 1.782H33.1z" fill="#e3e3e3"/><g fill="#d8d8d8"><path d="M116.333 38.169c-35.02-2.164-64.761-3.183-90.897-3.056v-.636c26.2-.064 55.942.891 90.961 3.055l-.064.637z"/><path d="M106.293 50.9l-.644-.127c.709-4.456.966-8.975.773-13.431-.837-1.846-1.803-3.056-2.833-3.756l.387-.509c1.158.764 2.188 2.101 3.09 4.074v.127c.257 4.456 0 9.039-.773 13.622zm-29.421-.064l-.386-11.585c-.064-2.228-.451-4.52-1.159-6.684l.644-.191a24.78 24.78 0 0 1 1.159 6.811l.386 11.585-.644.064z"/><path d="M114.272 51.473l-51.177-.891c-1.996-.064-3.862-1.082-4.828-2.801L48.868 31.74l.579-.318 9.399 16.041c.901 1.528 2.511 2.483 4.249 2.483l51.177.891v.636zm-73.13-11.077l-9.978-.382c-.966-.064-1.867-.446-2.511-1.082L26.4 36.577l.451-.446 2.253 2.355c.515.573 1.288.891 2.06.891l10.043.382-.064.637zm89.995 1.274l-.064-.637 11.008-.955.515-1.146.579.318-.708 1.4-11.33 1.019zm9.849 10.566a2.09 2.09 0 0 1-1.352-.509c-.386-.382-.644-.891-.644-1.464v-2.292-.064c.451-1.91 2.189-3.31 4.249-3.31h2.575v.636h-2.575a3.78 3.78 0 0 0-3.605 2.737v2.228c0 .382.193.7.451.955s.644.382 1.03.318l4.635-.446.064.637-4.635.446c-.064.127-.129.127-.193.127z"/></g><path d="M114.527 53.828a13.43 13.43 0 0 1-.129-4.265c.772-5.984 4.828-10.249 10.879-10.249 5.215 0 9.528 3.31 10.3 9.294.258 1.782.129 3.628-.257 5.347l-20.793-.127zm-80.21-1.719c0-.191.064-.446.064-.7.193-7.575 5.472-12.795 11.587-12.795 5.601 0 10.171 4.52 10.171 10.058 0 1.719.064 3.31-.193 4.647l-14.742-.064-6.888-1.146z" fill="#1d0000"/><path d="M45.971 57.393c4.871 0 8.819-3.904 8.819-8.721s-3.949-8.721-8.819-8.721-8.819 3.905-8.819 8.721 3.949 8.721 8.819 8.721z" fill="#736e68"/><g fill="#3c3c3c"><path d="M54.79 48.672c0 4.838-3.927 8.784-8.819 8.784s-8.819-3.883-8.819-8.721H54.79v-.064z"/><path d="M53.491 49.884c.678-4.129-2.158-8.02-6.334-8.69s-8.111 2.135-8.789 6.264 2.158 8.02 6.334 8.69 8.111-2.134 8.789-6.264z"/><path d="M53.631 48.608v.064c0 4.201-3.412 7.575-7.661 7.575s-7.66-3.374-7.66-7.575v-.064h15.321z"/></g><use xlink:href="#B" fill="#c4ccd9"/><path d="M45.969 42.561c3.412 0 6.18 2.737 6.18 6.111H39.725c0-3.374 2.768-6.111 6.244-6.111z" fill="#b0abab"/><path d="M45.97 52.427c2.098 0 3.798-1.681 3.798-3.756s-1.7-3.756-3.798-3.756-3.798 1.681-3.798 3.756 1.7 3.756 3.798 3.756z" fill="#565657"/><path d="M125.279 57.393c4.871 0 8.819-3.904 8.819-8.721s-3.948-8.721-8.819-8.721-8.819 3.905-8.819 8.721 3.948 8.721 8.819 8.721z" fill="#736e68"/><g fill="#3c3c3c"><path d="M134.098 48.672c0 4.838-3.927 8.784-8.819 8.784s-8.819-3.883-8.819-8.721h17.638v-.064z"/><path d="M132.719 50.43c.967-4.073-1.588-8.15-5.707-9.106s-8.241 1.57-9.208 5.643 1.587 8.15 5.706 9.106 8.242-1.57 9.209-5.643z"/><path d="M132.939 48.608v.064c0 4.201-3.412 7.575-7.661 7.575s-7.66-3.374-7.66-7.575v-.064h15.321z"/></g><use xlink:href="#B" x="79.308" fill="#c4ccd9"/><path d="M125.28 42.561c3.412 0 6.18 2.737 6.18 6.111H119.1c0-3.374 2.768-6.111 6.18-6.111z" fill="#b0abab"/><path d="M129.08 48.672c0 2.037-1.674 3.756-3.798 3.756-2.06 0-3.798-1.655-3.798-3.756s1.673-3.756 3.798-3.756c2.124.064 3.798 1.719 3.798 3.756z" fill="#565657"/><path d="M143.308 46.316h1.159v3.692l-2.961.573c-.644.127-1.223-.446-1.094-1.082l.193-1.019c.257-1.273 1.352-2.164 2.703-2.164z" fill="#1d0000"/><path d="M138.992 37.978l1.288.573c1.352.636 3.412 1.91 3.412 3.374h-3.477l-6.501-4.838 5.278.891z" fill="#e3e3e3"/><path d="M137.254 39.696l-3.54-2.673 5.278.955 1.288.573c.579.255 1.352.7 1.995 1.146h-5.021z" fill="#4a524a"/><path d="M137.45 37.723v2.101l-3.669-2.801 3.669.7z" fill="#ff8840"/><path d="M21.19 38.996l.966-1.019c.901-1.782 1.159-3.374.708-4.774h3.669c1.159 0 1.867 1.273 1.223 2.228l-.644.955a5.93 5.93 0 0 1-4.699 2.61H21.19z" fill="#e0ebe5"/><path d="M23.059 34.54c0-.446-.064-.891-.193-1.337h3.669c.837 0 1.416.636 1.416 1.337h-4.892z" fill="#d10018"/><path d="M22.156 37.978c.258-.573.515-1.082.644-1.591h4.313a5.93 5.93 0 0 1-4.699 2.61l-1.223.064.966-1.082z" fill="#ff8840"/><path d="M74.361 23.591h-1.481l1.288 8.975h2.832l-2.639-8.975z" fill="#404752"/><path d="M77.774 37.15c.193.637 1.094 1.146 2.189 1.209s2.06-.382 2.317-1.018l-4.506-.191z" fill="#e3e3e3"/><path d="M77.841 36.132c.257-.637 1.223-1.082 2.317-1.018s1.996.573 2.189 1.209l-4.506-.191z" fill="#d8d8d8"/><path d="M53.828 36.132c.193.636 1.094 1.146 2.189 1.209s2.06-.382 2.317-1.018l-4.506-.191z" fill="#e3e3e3"/><path d="M53.895 35.113c.258-.636 1.223-1.082 2.317-1.019s1.996.573 2.189 1.21l-4.506-.191z" fill="#d8d8d8"/><path d="M118.653 38.487l-2.125-.127c-.193 0-.321-.127-.257-.318v-.382c0-.191.129-.318.322-.255l2.124.127c.193 0 .322.127.258.318v.382c0 .127-.193.255-.322.255z" fill="#ff8840"/><defs ><path id="B" d="M45.972 54.783c3.413 0 6.18-2.736 6.18-6.111s-2.767-6.111-6.18-6.111-6.18 2.736-6.18 6.111 2.767 6.111 6.18 6.111z"/></defs></svg>
\ No newline at end of file
diff --git a/static/images/logos/car_make/suv.svg b/static/images/logos/car_make/suv.svg
deleted file mode 100644
index cd8f1e9e..00000000
--- a/static/images/logos/car_make/suv.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="164" height="80" fill="none"><g fill="#736e68"><path d="M47.257 20.953l-.492.491 38.586.393-.786-.491-37.308-.393z"/><path d="M80.633 19.676c1.081.049 2.9 1.031 3.932 1.67l3.834.049s-3.588-2.112-5.456-2.161c-7.865-.933-31.852-.933-36.521-.245-.688.098-2.703 1.915-2.703 1.915l3.539.049c.541-.54 1.475-1.326 1.819-1.424 4.031-.737 24.774-.737 31.557.147z"/><path d="M66.779 18.655l-1.966-.021-.012 1.179 1.966.02.012-1.178z"/></g><path d="M76.604 21.198l-1.573-.049 1.425 10.215 1.917.245-1.769-10.412z" fill="#ca8e59"/><path d="M127.624 41.089c-.099-1.326-.344-2.456-.787-3.389-.295-.639-.54-1.915-.983-2.357-2.851-1.621-11.846-2.75-20.3-3.241l-9.831-7.662c-3.539-2.554-7.766-4.027-12.141-4.125-7.324-.393-14.55-.589-21.529-.54-3.441-.049-13.763.54-18.531.884-1.18.098-2.409 1.621-2.31 1.473l9.241-.344-3.244 8.595-7.963-.049-1.524 1.915-.786 7.416-.885.933-.049 4.027c-.049 3.536 2.802 6.434 6.341 6.483l79.974 1.424h.541c3.342.049 6.046-2.652 6.095-5.943l.049-4.322-1.376-1.179zm-29.591-8.251l-31.557-2.014c-3.343-.196-6.685-.835-9.88-1.866l-2.605-.835c-.59-.197-.885-.786-.737-1.375l1.229-4.371a1.29 1.29 0 0 1 .885-.786c4.571-.835 23.053-.491 27.526 0 5.358.589 7.324 1.768 10.617 4.175l7.078 6.139-2.556.933z" fill="#e3e3e3"/><path d="M127.673 47.277h-.934c-.197 0-.393-.098-.492-.196a.63.63 0 0 1-.196-.491v-1.621c0-.393.344-.688.737-.688h.934c.393 0 .688.344.688.737v1.621c-.049.344-.344.639-.737.639zm-.885-2.505c-.098 0-.147.049-.147.147v1.621c0 .049 0 .098.049.098.049.049.049.049.098.049h.885c.098 0 .147-.049.147-.147V44.92c0-.098-.049-.147-.147-.147h-.885z" fill="#d8d8d8"/><path d="M47.896 28.614l-2.9.147c-1.868.049-4.178.246-5.751 1.424l-.049.147 7.914.049.787-1.768zm-3.588-5.451l5.505.098h.098l.59-1.473-9.29.344c.836.786 1.671.933 3.097 1.031z" fill="#ca8e59"/><path d="M41.21 22.132c-.197.295-.295.589-.393.982l-1.524 7.22 7.914.049 3.244-8.595-9.241.344z" fill="#e3e3e3"/><path d="M128.705 48.21c-.737 2.554-3.097 4.42-5.849 4.371h-.541l-79.973-1.473c-3.539-.049-6.39-2.947-6.341-6.483v-.442l92.704 4.027z" fill="#c1c1c1"/><g fill="#ca8e59"><path d="M75.028 32.003l4.571.049c0-.147.049-.344 0-.491l-.59-2.996a3.21 3.21 0 0 0-3.146-2.603h-.197c-.934 0-1.671.835-1.475 1.768l.836 4.273zm-19.759-2.799c1.622.638 3.244 1.179 4.965 1.473l-.442-2.357c-.295-1.523-1.622-2.603-3.146-2.603h-.197c-.934 0-1.671.835-1.475 1.768l.295 1.719z"/><path d="M53.992 28.123l2.605.835c3.195 1.031 6.488 1.621 9.88 1.866l31.606 2.014 2.556-.933-7.127-6.139c-3.293-2.407-5.21-3.585-10.617-4.175-4.473-.491-22.955-.835-27.526 0a1.29 1.29 0 0 0-.885.786l-1.229 4.371c-.197.589.147 1.179.737 1.375zm1.77-.982l1.131-4.027a1.02 1.02 0 0 1 .786-.688c4.129-.737 20.841-.442 24.872 0 4.866.54 6.636 1.621 9.585 3.782l6.39 5.599-2.31.835-28.559-1.866c-3.048-.196-5.997-.737-8.897-1.67l-2.359-.737c-.541-.147-.786-.737-.639-1.228z"/></g><path d="M51.681 26.257l1.278-3.094s.098-.147.148-.295c.295-.639.934-1.031 1.622-.933a.95.95 0 0 0-.246.442l-1.229 4.371c-.197.589.148 1.179.737 1.375l2.605.835c3.195 1.031 6.488 1.621 9.88 1.866l31.606 2.014 1.229-.442c.295.835-.098 1.277-.983 1.572l-31.95-1.915c-3.49-.196-6.931-.835-10.273-1.768l-2.605-.786c-.688-.197-1.278-.639-1.622-1.277s-.393-1.326-.197-1.964zM36.936 39.665v-.098l3.539.049c.295 0 .541.246.541.54s-.246.54-.541.54l-4.424-.049.885-.982zm13.416-8.939c1.081.147.983 1.768-.147 1.719-3.834-.098-8.061.098-12.583.54l.098-.737 1.524-1.915 7.078.049c1.376 0 2.753.147 4.031.344zm48.075 12.131c-.197-.147-35.096-.737-35.096-.737l-.098.098c-.344.442-.049 1.13.541 1.13l35.44 1.375c.492 0 .737-.639.344-.933l-1.13-.933z" fill="#fff"/><g fill="#d8d8d8"><path d="M98.374 42.219c-.197.147-35.096-.737-35.096-.737l-.098-.098c-.344-.442 0-1.13.59-1.13l35.489.147c.492 0 .737.638.295.933l-1.18.884z"/><path d="M76.109 45.804l-.492-10.559c-.049-.982-.688-3.88-.688-3.929l.492-.098c.049.098.688 2.996.737 4.027l.492 10.559h-.541zm26.052 1.031h-.491l.344-8.693c.049-1.67-.295-3.34-1.081-4.862l-.738-1.179.443-.246.737 1.228a10.8 10.8 0 0 1 1.131 5.108l-.345 8.644zM42.082 35.953l-.39.299 3.379 4.405.39-.299-3.379-4.405zM53.45 39.37l-.983-3.732a9.95 9.95 0 0 1 .442-6.532l.541-1.277.442.196-.541 1.277a9.38 9.38 0 0 0-.393 6.237l.983 3.733-.492.098zm71.222-1.424l-.344-1.326c-1.425-1.768-16.614-2.652-18.678-2.603h-.099l-2.457-2.259.344-.344 2.31 2.161c1.72 0 17.548.737 19.023 2.848l.049.098.344 1.375-.492.049z"/></g><path d="M91.398 22.623h1.425c.983.491 1.966 1.13 2.9 1.768l9.438 7.367h-2.016c-4.276-3.536-8.454-7.367-11.748-9.135z" fill="#435268"/><path d="M103.24 47.572c.197-4.518 4.031-8.005 8.504-7.809l4.031.147c4.374.147 7.815 3.782 7.766 8.153l-.049 4.518c-.197 0-.443.049-.688.049h-.541l-19.318-.344.295-4.715zm-60.899 3.536a5.89 5.89 0 0 1-1.622-.245l.197-4.518c.197-4.518 4.031-8.005 8.504-7.809l4.031.147c4.375.147 7.816 3.782 7.766 8.153l-.049 4.617-18.826-.344z" fill="#404752"/><path d="M122.314 52.581l-18.236-.344.197-4.617c.196-3.831 3.342-6.827 7.176-6.777h.197l4.03.147c3.785.147 6.735 3.241 6.735 7.023l-.05 4.518-.049.049zm-79.972-1.473c-.197 0-.344 0-.541-.049l.197-4.666c.197-3.831 3.343-6.827 7.177-6.777h.197l4.031.147c3.785.147 6.734 3.241 6.734 7.023l-.049 4.617-17.745-.295z" fill="#1d0000"/><path d="M52.855 59.589c4.687-1.055 7.631-5.707 6.575-10.391s-5.712-7.624-10.399-6.569-7.631 5.707-6.575 10.391 5.712 7.624 10.399 6.569z" fill="#736e68"/><g fill="#3c3c3c"><path d="M42.243 51.01c-.049 4.813 3.834 8.742 8.602 8.791 4.817.049 8.749-3.831 8.799-8.595l-17.401-.197z"/><path d="M43.422 51.01c-.049 4.174 3.293 7.563 7.471 7.612s7.57-3.291 7.619-7.465-3.293-7.563-7.471-7.612-7.57 3.29-7.619 7.465z"/><path d="M43.422 50.911v.098c-.049 4.175 3.293 7.563 7.471 7.612s7.57-3.291 7.619-7.465v-.098l-15.09-.147z"/></g><path d="M51.656 57.159c3.343-.392 5.735-3.419 5.342-6.759s-3.422-5.73-6.765-5.338-5.735 3.419-5.342 6.759 3.422 5.73 6.765 5.338z" fill="#c4ccd9"/><path d="M51.039 45.018a6.03 6.03 0 0 0-6.144 6.041l12.19.147c0-3.389-2.703-6.188-6.046-6.188z" fill="#b0abab"/><path d="M47.254 51.059c0 2.063 1.622 3.733 3.687 3.733s3.736-1.621 3.736-3.683-1.622-3.733-3.687-3.733-3.736 1.621-3.736 3.683z" fill="#565657"/><path d="M114.642 59.805c4.753-.704 8.035-5.124 7.33-9.873a8.7 8.7 0 0 0-9.881-7.325c-4.753.704-8.036 5.124-7.331 9.873a8.7 8.7 0 0 0 9.882 7.325z" fill="#736e68"/><g fill="#3c3c3c"><path d="M104.665 51.108a8.68 8.68 0 0 0 8.601 8.791c4.818.049 8.75-3.782 8.799-8.595l-17.4-.197z"/><path d="M115.086 58.567c4.072-.948 6.603-5.015 5.654-9.083s-5.019-6.597-9.091-5.649-6.602 5.015-5.653 9.083a7.57 7.57 0 0 0 9.09 5.649z"/><path d="M105.797 51.059v.098c-.049 4.175 3.294 7.563 7.472 7.612s7.57-3.291 7.619-7.465v-.098l-15.091-.147z"/></g><path d="M107.223 51.157a6.03 6.03 0 0 0 6.046 6.139 6.03 6.03 0 0 0 6.145-6.041 6.03 6.03 0 0 0-6.046-6.139c-3.343-.049-6.096 2.652-6.145 6.041z" fill="#c4ccd9"/><path d="M113.414 45.116a6.03 6.03 0 0 0-6.144 6.041l12.19.147c0-3.389-2.704-6.188-6.046-6.188z" fill="#b0abab"/><path d="M109.633 51.157c0 2.063 1.622 3.733 3.686 3.733s3.736-1.621 3.736-3.683-1.622-3.733-3.686-3.733c-2.016 0-3.736 1.621-3.736 3.683z" fill="#565657"/><path d="M96.166 29.056l-.049 3.094 1.868.098 1.524-.54-3.342-2.652z" fill="#c4ccd9"/><path d="M95.182 32.15h-1.819l.049-3.782h.786a2.35 2.35 0 0 1 2.359 2.456c.049.737-.59 1.326-1.376 1.326z" fill="#e3e3e3"/><path d="M96.413 29.891c-.344-.884-1.18-1.523-2.212-1.523h-.786v1.523h2.998z" fill="#fff"/><path d="M74.391 21.149l-1.524-.049 1.376 10.264 1.868.049-1.72-10.264zm-15.041.049h-1.229l-1.524 7.76 1.769.54.983-8.3z" fill="#404752"/><path d="M127.622 41.138c-.098-1.375-.344-2.505-.786-3.438l-4.719-.049 2.065 3.438 3.44.049z" fill="#e3e3e3"/><path d="M126.394 39.272c0 .737-.246 1.375-.541 1.375s-.541-.639-.541-1.375.246-1.375.541-1.375c.344 0 .541.639.541 1.375z" fill="#617797"/><path opacity=".23" d="M127.377 39.174c-.148-.54-.295-1.031-.541-1.522l-4.719-.049.885 1.523 4.375.049z" fill="#00659a"/><path d="M124.968 37.651h-2.851l2.065 3.438h.737l.049-3.438z" fill="#ff8840"/><path d="M39 32.445l-1.278-.049-.492 4.42 4.866-.491v-.197c.197-1.965-1.229-3.585-3.097-3.683z" fill="#d10018"/><path d="M37.476 34.606l-.246 2.161 4.866-.491v-.196c.049-.491 0-.982-.197-1.424l-4.424-.049z" fill="#e3e3e3"/><path d="M121.58 38.683c.049-.147.099-.344.099-.54 0-.688-.492-1.277-1.131-1.375-5.456-.933-10.322-.933-14.599-.196-.688.098-1.179.688-1.179 1.375 0 .197.049.344.098.54 4.964-.687 10.519-.687 16.712.197zm-44.389-3.88c.147.442.737.835 1.524.835.786.049 1.425-.245 1.622-.688l-3.146-.147z" fill="#fff"/><path d="M77.242 34.115c.197-.442.836-.737 1.622-.687s1.376.393 1.524.835l-3.146-.147z" fill="#d8d8d8"/><path d="M53.992 33.133c.147.442.737.835 1.524.835.786.049 1.425-.246 1.622-.688l-3.146-.147z" fill="#fff"/><path d="M53.992 32.445c.197-.442.836-.737 1.622-.688s1.376.393 1.524.835l-3.146-.147z" fill="#d8d8d8"/></svg>
\ No newline at end of file
diff --git a/static/images/logos/car_make/zx.png b/static/images/logos/car_make/zx.png
deleted file mode 100644
index 7b125b12..00000000
Binary files a/static/images/logos/car_make/zx.png and /dev/null differ
diff --git a/static/images/services/30199_outgoing-call.png b/static/images/services/30199_outgoing-call.png
new file mode 100644
index 00000000..13a91b6e
Binary files /dev/null and b/static/images/services/30199_outgoing-call.png differ
diff --git a/static/images/services/59166_meeting.png b/static/images/services/59166_meeting.png
new file mode 100644
index 00000000..02f6a62e
Binary files /dev/null and b/static/images/services/59166_meeting.png differ
diff --git a/static/js/app_admin/staff_index.js b/static/js/app_admin/staff_index.js
index 5173949d..70b6af40 100644
--- a/static/js/app_admin/staff_index.js
+++ b/static/js/app_admin/staff_index.js
@@ -319,10 +319,10 @@ function closeModal() {
     const cancelButton = document.getElementById("eventCancelBtn");
 
     // Reset the modal buttons to their default state
-    editButton.style.display = "";
-    closeButton.style.display = "";
+    /*editButton.style.display = "none";
+    closeButton.style.display = "none";
     submitButton.style.display = "none";
-    cancelButton.style.display = "none";
+    cancelButton.style.display = "none";*/
 
     // Reset the editing flag
     AppStateProxy.isEditingAppointment = false;
diff --git a/static/js/moment.js b/static/js/moment.js
new file mode 100644
index 00000000..ce2c32a4
--- /dev/null
+++ b/static/js/moment.js
@@ -0,0 +1,5688 @@
+//! moment.js
+//! version : 2.30.1
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+
+;(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    global.moment = factory()
+}(this, (function () { 'use strict';
+
+    var hookCallback;
+
+    function hooks() {
+        return hookCallback.apply(null, arguments);
+    }
+
+    // This is done to register the method called with moment()
+    // without creating circular dependencies.
+    function setHookCallback(callback) {
+        hookCallback = callback;
+    }
+
+    function isArray(input) {
+        return (
+            input instanceof Array ||
+            Object.prototype.toString.call(input) === '[object Array]'
+        );
+    }
+
+    function isObject(input) {
+        // IE8 will treat undefined and null as object if it wasn't for
+        // input != null
+        return (
+            input != null &&
+            Object.prototype.toString.call(input) === '[object Object]'
+        );
+    }
+
+    function hasOwnProp(a, b) {
+        return Object.prototype.hasOwnProperty.call(a, b);
+    }
+
+    function isObjectEmpty(obj) {
+        if (Object.getOwnPropertyNames) {
+            return Object.getOwnPropertyNames(obj).length === 0;
+        } else {
+            var k;
+            for (k in obj) {
+                if (hasOwnProp(obj, k)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    function isUndefined(input) {
+        return input === void 0;
+    }
+
+    function isNumber(input) {
+        return (
+            typeof input === 'number' ||
+            Object.prototype.toString.call(input) === '[object Number]'
+        );
+    }
+
+    function isDate(input) {
+        return (
+            input instanceof Date ||
+            Object.prototype.toString.call(input) === '[object Date]'
+        );
+    }
+
+    function map(arr, fn) {
+        var res = [],
+            i,
+            arrLen = arr.length;
+        for (i = 0; i < arrLen; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
+
+    function extend(a, b) {
+        for (var i in b) {
+            if (hasOwnProp(b, i)) {
+                a[i] = b[i];
+            }
+        }
+
+        if (hasOwnProp(b, 'toString')) {
+            a.toString = b.toString;
+        }
+
+        if (hasOwnProp(b, 'valueOf')) {
+            a.valueOf = b.valueOf;
+        }
+
+        return a;
+    }
+
+    function createUTC(input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, true).utc();
+    }
+
+    function defaultParsingFlags() {
+        // We need to deep clone this object.
+        return {
+            empty: false,
+            unusedTokens: [],
+            unusedInput: [],
+            overflow: -2,
+            charsLeftOver: 0,
+            nullInput: false,
+            invalidEra: null,
+            invalidMonth: null,
+            invalidFormat: false,
+            userInvalidated: false,
+            iso: false,
+            parsedDateParts: [],
+            era: null,
+            meridiem: null,
+            rfc2822: false,
+            weekdayMismatch: false,
+        };
+    }
+
+    function getParsingFlags(m) {
+        if (m._pf == null) {
+            m._pf = defaultParsingFlags();
+        }
+        return m._pf;
+    }
+
+    var some;
+    if (Array.prototype.some) {
+        some = Array.prototype.some;
+    } else {
+        some = function (fun) {
+            var t = Object(this),
+                len = t.length >>> 0,
+                i;
+
+            for (i = 0; i < len; i++) {
+                if (i in t && fun.call(this, t[i], i, t)) {
+                    return true;
+                }
+            }
+
+            return false;
+        };
+    }
+
+    function isValid(m) {
+        var flags = null,
+            parsedParts = false,
+            isNowValid = m._d && !isNaN(m._d.getTime());
+        if (isNowValid) {
+            flags = getParsingFlags(m);
+            parsedParts = some.call(flags.parsedDateParts, function (i) {
+                return i != null;
+            });
+            isNowValid =
+                flags.overflow < 0 &&
+                !flags.empty &&
+                !flags.invalidEra &&
+                !flags.invalidMonth &&
+                !flags.invalidWeekday &&
+                !flags.weekdayMismatch &&
+                !flags.nullInput &&
+                !flags.invalidFormat &&
+                !flags.userInvalidated &&
+                (!flags.meridiem || (flags.meridiem && parsedParts));
+            if (m._strict) {
+                isNowValid =
+                    isNowValid &&
+                    flags.charsLeftOver === 0 &&
+                    flags.unusedTokens.length === 0 &&
+                    flags.bigHour === undefined;
+            }
+        }
+        if (Object.isFrozen == null || !Object.isFrozen(m)) {
+            m._isValid = isNowValid;
+        } else {
+            return isNowValid;
+        }
+        return m._isValid;
+    }
+
+    function createInvalid(flags) {
+        var m = createUTC(NaN);
+        if (flags != null) {
+            extend(getParsingFlags(m), flags);
+        } else {
+            getParsingFlags(m).userInvalidated = true;
+        }
+
+        return m;
+    }
+
+    // Plugins that add properties should also add the key here (null value),
+    // so we can properly clone ourselves.
+    var momentProperties = (hooks.momentProperties = []),
+        updateInProgress = false;
+
+    function copyConfig(to, from) {
+        var i,
+            prop,
+            val,
+            momentPropertiesLen = momentProperties.length;
+
+        if (!isUndefined(from._isAMomentObject)) {
+            to._isAMomentObject = from._isAMomentObject;
+        }
+        if (!isUndefined(from._i)) {
+            to._i = from._i;
+        }
+        if (!isUndefined(from._f)) {
+            to._f = from._f;
+        }
+        if (!isUndefined(from._l)) {
+            to._l = from._l;
+        }
+        if (!isUndefined(from._strict)) {
+            to._strict = from._strict;
+        }
+        if (!isUndefined(from._tzm)) {
+            to._tzm = from._tzm;
+        }
+        if (!isUndefined(from._isUTC)) {
+            to._isUTC = from._isUTC;
+        }
+        if (!isUndefined(from._offset)) {
+            to._offset = from._offset;
+        }
+        if (!isUndefined(from._pf)) {
+            to._pf = getParsingFlags(from);
+        }
+        if (!isUndefined(from._locale)) {
+            to._locale = from._locale;
+        }
+
+        if (momentPropertiesLen > 0) {
+            for (i = 0; i < momentPropertiesLen; i++) {
+                prop = momentProperties[i];
+                val = from[prop];
+                if (!isUndefined(val)) {
+                    to[prop] = val;
+                }
+            }
+        }
+
+        return to;
+    }
+
+    // Moment prototype object
+    function Moment(config) {
+        copyConfig(this, config);
+        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
+        if (!this.isValid()) {
+            this._d = new Date(NaN);
+        }
+        // Prevent infinite loop in case updateOffset creates new moment
+        // objects.
+        if (updateInProgress === false) {
+            updateInProgress = true;
+            hooks.updateOffset(this);
+            updateInProgress = false;
+        }
+    }
+
+    function isMoment(obj) {
+        return (
+            obj instanceof Moment || (obj != null && obj._isAMomentObject != null)
+        );
+    }
+
+    function warn(msg) {
+        if (
+            hooks.suppressDeprecationWarnings === false &&
+            typeof console !== 'undefined' &&
+            console.warn
+        ) {
+            console.warn('Deprecation warning: ' + msg);
+        }
+    }
+
+    function deprecate(msg, fn) {
+        var firstTime = true;
+
+        return extend(function () {
+            if (hooks.deprecationHandler != null) {
+                hooks.deprecationHandler(null, msg);
+            }
+            if (firstTime) {
+                var args = [],
+                    arg,
+                    i,
+                    key,
+                    argLen = arguments.length;
+                for (i = 0; i < argLen; i++) {
+                    arg = '';
+                    if (typeof arguments[i] === 'object') {
+                        arg += '\n[' + i + '] ';
+                        for (key in arguments[0]) {
+                            if (hasOwnProp(arguments[0], key)) {
+                                arg += key + ': ' + arguments[0][key] + ', ';
+                            }
+                        }
+                        arg = arg.slice(0, -2); // Remove trailing comma and space
+                    } else {
+                        arg = arguments[i];
+                    }
+                    args.push(arg);
+                }
+                warn(
+                    msg +
+                        '\nArguments: ' +
+                        Array.prototype.slice.call(args).join('') +
+                        '\n' +
+                        new Error().stack
+                );
+                firstTime = false;
+            }
+            return fn.apply(this, arguments);
+        }, fn);
+    }
+
+    var deprecations = {};
+
+    function deprecateSimple(name, msg) {
+        if (hooks.deprecationHandler != null) {
+            hooks.deprecationHandler(name, msg);
+        }
+        if (!deprecations[name]) {
+            warn(msg);
+            deprecations[name] = true;
+        }
+    }
+
+    hooks.suppressDeprecationWarnings = false;
+    hooks.deprecationHandler = null;
+
+    function isFunction(input) {
+        return (
+            (typeof Function !== 'undefined' && input instanceof Function) ||
+            Object.prototype.toString.call(input) === '[object Function]'
+        );
+    }
+
+    function set(config) {
+        var prop, i;
+        for (i in config) {
+            if (hasOwnProp(config, i)) {
+                prop = config[i];
+                if (isFunction(prop)) {
+                    this[i] = prop;
+                } else {
+                    this['_' + i] = prop;
+                }
+            }
+        }
+        this._config = config;
+        // Lenient ordinal parsing accepts just a number in addition to
+        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
+        // TODO: Remove "ordinalParse" fallback in next major release.
+        this._dayOfMonthOrdinalParseLenient = new RegExp(
+            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
+                '|' +
+                /\d{1,2}/.source
+        );
+    }
+
+    function mergeConfigs(parentConfig, childConfig) {
+        var res = extend({}, parentConfig),
+            prop;
+        for (prop in childConfig) {
+            if (hasOwnProp(childConfig, prop)) {
+                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
+                    res[prop] = {};
+                    extend(res[prop], parentConfig[prop]);
+                    extend(res[prop], childConfig[prop]);
+                } else if (childConfig[prop] != null) {
+                    res[prop] = childConfig[prop];
+                } else {
+                    delete res[prop];
+                }
+            }
+        }
+        for (prop in parentConfig) {
+            if (
+                hasOwnProp(parentConfig, prop) &&
+                !hasOwnProp(childConfig, prop) &&
+                isObject(parentConfig[prop])
+            ) {
+                // make sure changes to properties don't modify parent config
+                res[prop] = extend({}, res[prop]);
+            }
+        }
+        return res;
+    }
+
+    function Locale(config) {
+        if (config != null) {
+            this.set(config);
+        }
+    }
+
+    var keys;
+
+    if (Object.keys) {
+        keys = Object.keys;
+    } else {
+        keys = function (obj) {
+            var i,
+                res = [];
+            for (i in obj) {
+                if (hasOwnProp(obj, i)) {
+                    res.push(i);
+                }
+            }
+            return res;
+        };
+    }
+
+    var defaultCalendar = {
+        sameDay: '[Today at] LT',
+        nextDay: '[Tomorrow at] LT',
+        nextWeek: 'dddd [at] LT',
+        lastDay: '[Yesterday at] LT',
+        lastWeek: '[Last] dddd [at] LT',
+        sameElse: 'L',
+    };
+
+    function calendar(key, mom, now) {
+        var output = this._calendar[key] || this._calendar['sameElse'];
+        return isFunction(output) ? output.call(mom, now) : output;
+    }
+
+    function zeroFill(number, targetLength, forceSign) {
+        var absNumber = '' + Math.abs(number),
+            zerosToFill = targetLength - absNumber.length,
+            sign = number >= 0;
+        return (
+            (sign ? (forceSign ? '+' : '') : '-') +
+            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) +
+            absNumber
+        );
+    }
+
+    var formattingTokens =
+            /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,
+        localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,
+        formatFunctions = {},
+        formatTokenFunctions = {};
+
+    // token:    'M'
+    // padded:   ['MM', 2]
+    // ordinal:  'Mo'
+    // callback: function () { this.month() + 1 }
+    function addFormatToken(token, padded, ordinal, callback) {
+        var func = callback;
+        if (typeof callback === 'string') {
+            func = function () {
+                return this[callback]();
+            };
+        }
+        if (token) {
+            formatTokenFunctions[token] = func;
+        }
+        if (padded) {
+            formatTokenFunctions[padded[0]] = function () {
+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+            };
+        }
+        if (ordinal) {
+            formatTokenFunctions[ordinal] = function () {
+                return this.localeData().ordinal(
+                    func.apply(this, arguments),
+                    token
+                );
+            };
+        }
+    }
+
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, '');
+        }
+        return input.replace(/\\/g, '');
+    }
+
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens),
+            i,
+            length;
+
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
+
+        return function (mom) {
+            var output = '',
+                i;
+            for (i = 0; i < length; i++) {
+                output += isFunction(array[i])
+                    ? array[i].call(mom, format)
+                    : array[i];
+            }
+            return output;
+        };
+    }
+
+    // format date using native date object
+    function formatMoment(m, format) {
+        if (!m.isValid()) {
+            return m.localeData().invalidDate();
+        }
+
+        format = expandFormat(format, m.localeData());
+        formatFunctions[format] =
+            formatFunctions[format] || makeFormatFunction(format);
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, locale) {
+        var i = 5;
+
+        function replaceLongDateFormatTokens(input) {
+            return locale.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(
+                localFormattingTokens,
+                replaceLongDateFormatTokens
+            );
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
+
+        return format;
+    }
+
+    var defaultLongDateFormat = {
+        LTS: 'h:mm:ss A',
+        LT: 'h:mm A',
+        L: 'MM/DD/YYYY',
+        LL: 'MMMM D, YYYY',
+        LLL: 'MMMM D, YYYY h:mm A',
+        LLLL: 'dddd, MMMM D, YYYY h:mm A',
+    };
+
+    function longDateFormat(key) {
+        var format = this._longDateFormat[key],
+            formatUpper = this._longDateFormat[key.toUpperCase()];
+
+        if (format || !formatUpper) {
+            return format;
+        }
+
+        this._longDateFormat[key] = formatUpper
+            .match(formattingTokens)
+            .map(function (tok) {
+                if (
+                    tok === 'MMMM' ||
+                    tok === 'MM' ||
+                    tok === 'DD' ||
+                    tok === 'dddd'
+                ) {
+                    return tok.slice(1);
+                }
+                return tok;
+            })
+            .join('');
+
+        return this._longDateFormat[key];
+    }
+
+    var defaultInvalidDate = 'Invalid date';
+
+    function invalidDate() {
+        return this._invalidDate;
+    }
+
+    var defaultOrdinal = '%d',
+        defaultDayOfMonthOrdinalParse = /\d{1,2}/;
+
+    function ordinal(number) {
+        return this._ordinal.replace('%d', number);
+    }
+
+    var defaultRelativeTime = {
+        future: 'in %s',
+        past: '%s ago',
+        s: 'a few seconds',
+        ss: '%d seconds',
+        m: 'a minute',
+        mm: '%d minutes',
+        h: 'an hour',
+        hh: '%d hours',
+        d: 'a day',
+        dd: '%d days',
+        w: 'a week',
+        ww: '%d weeks',
+        M: 'a month',
+        MM: '%d months',
+        y: 'a year',
+        yy: '%d years',
+    };
+
+    function relativeTime(number, withoutSuffix, string, isFuture) {
+        var output = this._relativeTime[string];
+        return isFunction(output)
+            ? output(number, withoutSuffix, string, isFuture)
+            : output.replace(/%d/i, number);
+    }
+
+    function pastFuture(diff, output) {
+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
+    }
+
+    var aliases = {
+        D: 'date',
+        dates: 'date',
+        date: 'date',
+        d: 'day',
+        days: 'day',
+        day: 'day',
+        e: 'weekday',
+        weekdays: 'weekday',
+        weekday: 'weekday',
+        E: 'isoWeekday',
+        isoweekdays: 'isoWeekday',
+        isoweekday: 'isoWeekday',
+        DDD: 'dayOfYear',
+        dayofyears: 'dayOfYear',
+        dayofyear: 'dayOfYear',
+        h: 'hour',
+        hours: 'hour',
+        hour: 'hour',
+        ms: 'millisecond',
+        milliseconds: 'millisecond',
+        millisecond: 'millisecond',
+        m: 'minute',
+        minutes: 'minute',
+        minute: 'minute',
+        M: 'month',
+        months: 'month',
+        month: 'month',
+        Q: 'quarter',
+        quarters: 'quarter',
+        quarter: 'quarter',
+        s: 'second',
+        seconds: 'second',
+        second: 'second',
+        gg: 'weekYear',
+        weekyears: 'weekYear',
+        weekyear: 'weekYear',
+        GG: 'isoWeekYear',
+        isoweekyears: 'isoWeekYear',
+        isoweekyear: 'isoWeekYear',
+        w: 'week',
+        weeks: 'week',
+        week: 'week',
+        W: 'isoWeek',
+        isoweeks: 'isoWeek',
+        isoweek: 'isoWeek',
+        y: 'year',
+        years: 'year',
+        year: 'year',
+    };
+
+    function normalizeUnits(units) {
+        return typeof units === 'string'
+            ? aliases[units] || aliases[units.toLowerCase()]
+            : undefined;
+    }
+
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
+
+        for (prop in inputObject) {
+            if (hasOwnProp(inputObject, prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
+    }
+
+    var priorities = {
+        date: 9,
+        day: 11,
+        weekday: 11,
+        isoWeekday: 11,
+        dayOfYear: 4,
+        hour: 13,
+        millisecond: 16,
+        minute: 14,
+        month: 8,
+        quarter: 7,
+        second: 15,
+        weekYear: 1,
+        isoWeekYear: 1,
+        week: 5,
+        isoWeek: 5,
+        year: 1,
+    };
+
+    function getPrioritizedUnits(unitsObj) {
+        var units = [],
+            u;
+        for (u in unitsObj) {
+            if (hasOwnProp(unitsObj, u)) {
+                units.push({ unit: u, priority: priorities[u] });
+            }
+        }
+        units.sort(function (a, b) {
+            return a.priority - b.priority;
+        });
+        return units;
+    }
+
+    var match1 = /\d/, //       0 - 9
+        match2 = /\d\d/, //      00 - 99
+        match3 = /\d{3}/, //     000 - 999
+        match4 = /\d{4}/, //    0000 - 9999
+        match6 = /[+-]?\d{6}/, // -999999 - 999999
+        match1to2 = /\d\d?/, //       0 - 99
+        match3to4 = /\d\d\d\d?/, //     999 - 9999
+        match5to6 = /\d\d\d\d\d\d?/, //   99999 - 999999
+        match1to3 = /\d{1,3}/, //       0 - 999
+        match1to4 = /\d{1,4}/, //       0 - 9999
+        match1to6 = /[+-]?\d{1,6}/, // -999999 - 999999
+        matchUnsigned = /\d+/, //       0 - inf
+        matchSigned = /[+-]?\d+/, //    -inf - inf
+        matchOffset = /Z|[+-]\d\d:?\d\d/gi, // +00:00 -00:00 +0000 -0000 or Z
+        matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi, // +00 -00 +00:00 -00:00 +0000 -0000 or Z
+        matchTimestamp = /[+-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123
+        // any word (or two) characters or numbers including two/three word month in arabic.
+        // includes scottish gaelic two word and hyphenated months
+        matchWord =
+            /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,
+        match1to2NoLeadingZero = /^[1-9]\d?/, //         1-99
+        match1to2HasZero = /^([1-9]\d|\d)/, //           0-99
+        regexes;
+
+    regexes = {};
+
+    function addRegexToken(token, regex, strictRegex) {
+        regexes[token] = isFunction(regex)
+            ? regex
+            : function (isStrict, localeData) {
+                  return isStrict && strictRegex ? strictRegex : regex;
+              };
+    }
+
+    function getParseRegexForToken(token, config) {
+        if (!hasOwnProp(regexes, token)) {
+            return new RegExp(unescapeFormat(token));
+        }
+
+        return regexes[token](config._strict, config._locale);
+    }
+
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function unescapeFormat(s) {
+        return regexEscape(
+            s
+                .replace('\\', '')
+                .replace(
+                    /\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,
+                    function (matched, p1, p2, p3, p4) {
+                        return p1 || p2 || p3 || p4;
+                    }
+                )
+        );
+    }
+
+    function regexEscape(s) {
+        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+
+    function absFloor(number) {
+        if (number < 0) {
+            // -0 -> 0
+            return Math.ceil(number) || 0;
+        } else {
+            return Math.floor(number);
+        }
+    }
+
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
+
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            value = absFloor(coercedNumber);
+        }
+
+        return value;
+    }
+
+    var tokens = {};
+
+    function addParseToken(token, callback) {
+        var i,
+            func = callback,
+            tokenLen;
+        if (typeof token === 'string') {
+            token = [token];
+        }
+        if (isNumber(callback)) {
+            func = function (input, array) {
+                array[callback] = toInt(input);
+            };
+        }
+        tokenLen = token.length;
+        for (i = 0; i < tokenLen; i++) {
+            tokens[token[i]] = func;
+        }
+    }
+
+    function addWeekParseToken(token, callback) {
+        addParseToken(token, function (input, array, config, token) {
+            config._w = config._w || {};
+            callback(input, config._w, config, token);
+        });
+    }
+
+    function addTimeToArrayFromToken(token, input, config) {
+        if (input != null && hasOwnProp(tokens, token)) {
+            tokens[token](input, config._a, config, token);
+        }
+    }
+
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
+
+    var YEAR = 0,
+        MONTH = 1,
+        DATE = 2,
+        HOUR = 3,
+        MINUTE = 4,
+        SECOND = 5,
+        MILLISECOND = 6,
+        WEEK = 7,
+        WEEKDAY = 8;
+
+    // FORMATTING
+
+    addFormatToken('Y', 0, 0, function () {
+        var y = this.year();
+        return y <= 9999 ? zeroFill(y, 4) : '+' + y;
+    });
+
+    addFormatToken(0, ['YY', 2], 0, function () {
+        return this.year() % 100;
+    });
+
+    addFormatToken(0, ['YYYY', 4], 0, 'year');
+    addFormatToken(0, ['YYYYY', 5], 0, 'year');
+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
+
+    // PARSING
+
+    addRegexToken('Y', matchSigned);
+    addRegexToken('YY', match1to2, match2);
+    addRegexToken('YYYY', match1to4, match4);
+    addRegexToken('YYYYY', match1to6, match6);
+    addRegexToken('YYYYYY', match1to6, match6);
+
+    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
+    addParseToken('YYYY', function (input, array) {
+        array[YEAR] =
+            input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
+    });
+    addParseToken('YY', function (input, array) {
+        array[YEAR] = hooks.parseTwoDigitYear(input);
+    });
+    addParseToken('Y', function (input, array) {
+        array[YEAR] = parseInt(input, 10);
+    });
+
+    // HELPERS
+
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
+    }
+
+    // HOOKS
+
+    hooks.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
+
+    // MOMENTS
+
+    var getSetYear = makeGetSet('FullYear', true);
+
+    function getIsLeapYear() {
+        return isLeapYear(this.year());
+    }
+
+    function makeGetSet(unit, keepTime) {
+        return function (value) {
+            if (value != null) {
+                set$1(this, unit, value);
+                hooks.updateOffset(this, keepTime);
+                return this;
+            } else {
+                return get(this, unit);
+            }
+        };
+    }
+
+    function get(mom, unit) {
+        if (!mom.isValid()) {
+            return NaN;
+        }
+
+        var d = mom._d,
+            isUTC = mom._isUTC;
+
+        switch (unit) {
+            case 'Milliseconds':
+                return isUTC ? d.getUTCMilliseconds() : d.getMilliseconds();
+            case 'Seconds':
+                return isUTC ? d.getUTCSeconds() : d.getSeconds();
+            case 'Minutes':
+                return isUTC ? d.getUTCMinutes() : d.getMinutes();
+            case 'Hours':
+                return isUTC ? d.getUTCHours() : d.getHours();
+            case 'Date':
+                return isUTC ? d.getUTCDate() : d.getDate();
+            case 'Day':
+                return isUTC ? d.getUTCDay() : d.getDay();
+            case 'Month':
+                return isUTC ? d.getUTCMonth() : d.getMonth();
+            case 'FullYear':
+                return isUTC ? d.getUTCFullYear() : d.getFullYear();
+            default:
+                return NaN; // Just in case
+        }
+    }
+
+    function set$1(mom, unit, value) {
+        var d, isUTC, year, month, date;
+
+        if (!mom.isValid() || isNaN(value)) {
+            return;
+        }
+
+        d = mom._d;
+        isUTC = mom._isUTC;
+
+        switch (unit) {
+            case 'Milliseconds':
+                return void (isUTC
+                    ? d.setUTCMilliseconds(value)
+                    : d.setMilliseconds(value));
+            case 'Seconds':
+                return void (isUTC ? d.setUTCSeconds(value) : d.setSeconds(value));
+            case 'Minutes':
+                return void (isUTC ? d.setUTCMinutes(value) : d.setMinutes(value));
+            case 'Hours':
+                return void (isUTC ? d.setUTCHours(value) : d.setHours(value));
+            case 'Date':
+                return void (isUTC ? d.setUTCDate(value) : d.setDate(value));
+            // case 'Day': // Not real
+            //    return void (isUTC ? d.setUTCDay(value) : d.setDay(value));
+            // case 'Month': // Not used because we need to pass two variables
+            //     return void (isUTC ? d.setUTCMonth(value) : d.setMonth(value));
+            case 'FullYear':
+                break; // See below ...
+            default:
+                return; // Just in case
+        }
+
+        year = value;
+        month = mom.month();
+        date = mom.date();
+        date = date === 29 && month === 1 && !isLeapYear(year) ? 28 : date;
+        void (isUTC
+            ? d.setUTCFullYear(year, month, date)
+            : d.setFullYear(year, month, date));
+    }
+
+    // MOMENTS
+
+    function stringGet(units) {
+        units = normalizeUnits(units);
+        if (isFunction(this[units])) {
+            return this[units]();
+        }
+        return this;
+    }
+
+    function stringSet(units, value) {
+        if (typeof units === 'object') {
+            units = normalizeObjectUnits(units);
+            var prioritized = getPrioritizedUnits(units),
+                i,
+                prioritizedLen = prioritized.length;
+            for (i = 0; i < prioritizedLen; i++) {
+                this[prioritized[i].unit](units[prioritized[i].unit]);
+            }
+        } else {
+            units = normalizeUnits(units);
+            if (isFunction(this[units])) {
+                return this[units](value);
+            }
+        }
+        return this;
+    }
+
+    function mod(n, x) {
+        return ((n % x) + x) % x;
+    }
+
+    var indexOf;
+
+    if (Array.prototype.indexOf) {
+        indexOf = Array.prototype.indexOf;
+    } else {
+        indexOf = function (o) {
+            // I know
+            var i;
+            for (i = 0; i < this.length; ++i) {
+                if (this[i] === o) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+    }
+
+    function daysInMonth(year, month) {
+        if (isNaN(year) || isNaN(month)) {
+            return NaN;
+        }
+        var modMonth = mod(month, 12);
+        year += (month - modMonth) / 12;
+        return modMonth === 1
+            ? isLeapYear(year)
+                ? 29
+                : 28
+            : 31 - ((modMonth % 7) % 2);
+    }
+
+    // FORMATTING
+
+    addFormatToken('M', ['MM', 2], 'Mo', function () {
+        return this.month() + 1;
+    });
+
+    addFormatToken('MMM', 0, 0, function (format) {
+        return this.localeData().monthsShort(this, format);
+    });
+
+    addFormatToken('MMMM', 0, 0, function (format) {
+        return this.localeData().months(this, format);
+    });
+
+    // PARSING
+
+    addRegexToken('M', match1to2, match1to2NoLeadingZero);
+    addRegexToken('MM', match1to2, match2);
+    addRegexToken('MMM', function (isStrict, locale) {
+        return locale.monthsShortRegex(isStrict);
+    });
+    addRegexToken('MMMM', function (isStrict, locale) {
+        return locale.monthsRegex(isStrict);
+    });
+
+    addParseToken(['M', 'MM'], function (input, array) {
+        array[MONTH] = toInt(input) - 1;
+    });
+
+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+        var month = config._locale.monthsParse(input, token, config._strict);
+        // if we didn't find a month name, mark the date as invalid.
+        if (month != null) {
+            array[MONTH] = month;
+        } else {
+            getParsingFlags(config).invalidMonth = input;
+        }
+    });
+
+    // LOCALES
+
+    var defaultLocaleMonths =
+            'January_February_March_April_May_June_July_August_September_October_November_December'.split(
+                '_'
+            ),
+        defaultLocaleMonthsShort =
+            'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,
+        defaultMonthsShortRegex = matchWord,
+        defaultMonthsRegex = matchWord;
+
+    function localeMonths(m, format) {
+        if (!m) {
+            return isArray(this._months)
+                ? this._months
+                : this._months['standalone'];
+        }
+        return isArray(this._months)
+            ? this._months[m.month()]
+            : this._months[
+                  (this._months.isFormat || MONTHS_IN_FORMAT).test(format)
+                      ? 'format'
+                      : 'standalone'
+              ][m.month()];
+    }
+
+    function localeMonthsShort(m, format) {
+        if (!m) {
+            return isArray(this._monthsShort)
+                ? this._monthsShort
+                : this._monthsShort['standalone'];
+        }
+        return isArray(this._monthsShort)
+            ? this._monthsShort[m.month()]
+            : this._monthsShort[
+                  MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'
+              ][m.month()];
+    }
+
+    function handleStrictParse(monthName, format, strict) {
+        var i,
+            ii,
+            mom,
+            llc = monthName.toLocaleLowerCase();
+        if (!this._monthsParse) {
+            // this is not used
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+            for (i = 0; i < 12; ++i) {
+                mom = createUTC([2000, i]);
+                this._shortMonthsParse[i] = this.monthsShort(
+                    mom,
+                    ''
+                ).toLocaleLowerCase();
+                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
+            }
+        }
+
+        if (strict) {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
+    }
+
+    function localeMonthsParse(monthName, format, strict) {
+        var i, mom, regex;
+
+        if (this._monthsParseExact) {
+            return handleStrictParse.call(this, monthName, format, strict);
+        }
+
+        if (!this._monthsParse) {
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+        }
+
+        // TODO: add sorting
+        // Sorting makes sure if one month (or abbr) is a prefix of another
+        // see sorting in computeMonthsParse
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, i]);
+            if (strict && !this._longMonthsParse[i]) {
+                this._longMonthsParse[i] = new RegExp(
+                    '^' + this.months(mom, '').replace('.', '') + '$',
+                    'i'
+                );
+                this._shortMonthsParse[i] = new RegExp(
+                    '^' + this.monthsShort(mom, '').replace('.', '') + '$',
+                    'i'
+                );
+            }
+            if (!strict && !this._monthsParse[i]) {
+                regex =
+                    '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (
+                strict &&
+                format === 'MMMM' &&
+                this._longMonthsParse[i].test(monthName)
+            ) {
+                return i;
+            } else if (
+                strict &&
+                format === 'MMM' &&
+                this._shortMonthsParse[i].test(monthName)
+            ) {
+                return i;
+            } else if (!strict && this._monthsParse[i].test(monthName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function setMonth(mom, value) {
+        if (!mom.isValid()) {
+            // No op
+            return mom;
+        }
+
+        if (typeof value === 'string') {
+            if (/^\d+$/.test(value)) {
+                value = toInt(value);
+            } else {
+                value = mom.localeData().monthsParse(value);
+                // TODO: Another silent failure?
+                if (!isNumber(value)) {
+                    return mom;
+                }
+            }
+        }
+
+        var month = value,
+            date = mom.date();
+
+        date = date < 29 ? date : Math.min(date, daysInMonth(mom.year(), month));
+        void (mom._isUTC
+            ? mom._d.setUTCMonth(month, date)
+            : mom._d.setMonth(month, date));
+        return mom;
+    }
+
+    function getSetMonth(value) {
+        if (value != null) {
+            setMonth(this, value);
+            hooks.updateOffset(this, true);
+            return this;
+        } else {
+            return get(this, 'Month');
+        }
+    }
+
+    function getDaysInMonth() {
+        return daysInMonth(this.year(), this.month());
+    }
+
+    function monthsShortRegex(isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsShortStrictRegex;
+            } else {
+                return this._monthsShortRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_monthsShortRegex')) {
+                this._monthsShortRegex = defaultMonthsShortRegex;
+            }
+            return this._monthsShortStrictRegex && isStrict
+                ? this._monthsShortStrictRegex
+                : this._monthsShortRegex;
+        }
+    }
+
+    function monthsRegex(isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsStrictRegex;
+            } else {
+                return this._monthsRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                this._monthsRegex = defaultMonthsRegex;
+            }
+            return this._monthsStrictRegex && isStrict
+                ? this._monthsStrictRegex
+                : this._monthsRegex;
+        }
+    }
+
+    function computeMonthsParse() {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
+
+        var shortPieces = [],
+            longPieces = [],
+            mixedPieces = [],
+            i,
+            mom,
+            shortP,
+            longP;
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, i]);
+            shortP = regexEscape(this.monthsShort(mom, ''));
+            longP = regexEscape(this.months(mom, ''));
+            shortPieces.push(shortP);
+            longPieces.push(longP);
+            mixedPieces.push(longP);
+            mixedPieces.push(shortP);
+        }
+        // Sorting makes sure if one month (or abbr) is a prefix of another it
+        // will match the longer piece.
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+
+        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._monthsShortRegex = this._monthsRegex;
+        this._monthsStrictRegex = new RegExp(
+            '^(' + longPieces.join('|') + ')',
+            'i'
+        );
+        this._monthsShortStrictRegex = new RegExp(
+            '^(' + shortPieces.join('|') + ')',
+            'i'
+        );
+    }
+
+    function createDate(y, m, d, h, M, s, ms) {
+        // can't just apply() to create a date:
+        // https://stackoverflow.com/q/181348
+        var date;
+        // the date constructor remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            // preserve leap years using a full 400 year cycle, then reset
+            date = new Date(y + 400, m, d, h, M, s, ms);
+            if (isFinite(date.getFullYear())) {
+                date.setFullYear(y);
+            }
+        } else {
+            date = new Date(y, m, d, h, M, s, ms);
+        }
+
+        return date;
+    }
+
+    function createUTCDate(y) {
+        var date, args;
+        // the Date.UTC function remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            args = Array.prototype.slice.call(arguments);
+            // preserve leap years using a full 400 year cycle, then reset
+            args[0] = y + 400;
+            date = new Date(Date.UTC.apply(null, args));
+            if (isFinite(date.getUTCFullYear())) {
+                date.setUTCFullYear(y);
+            }
+        } else {
+            date = new Date(Date.UTC.apply(null, arguments));
+        }
+
+        return date;
+    }
+
+    // start-of-first-week - start-of-year
+    function firstWeekOffset(year, dow, doy) {
+        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
+            fwd = 7 + dow - doy,
+            // first-week day local weekday -- which local weekday is fwd
+            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
+
+        return -fwdlw + fwd - 1;
+    }
+
+    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
+        var localWeekday = (7 + weekday - dow) % 7,
+            weekOffset = firstWeekOffset(year, dow, doy),
+            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
+            resYear,
+            resDayOfYear;
+
+        if (dayOfYear <= 0) {
+            resYear = year - 1;
+            resDayOfYear = daysInYear(resYear) + dayOfYear;
+        } else if (dayOfYear > daysInYear(year)) {
+            resYear = year + 1;
+            resDayOfYear = dayOfYear - daysInYear(year);
+        } else {
+            resYear = year;
+            resDayOfYear = dayOfYear;
+        }
+
+        return {
+            year: resYear,
+            dayOfYear: resDayOfYear,
+        };
+    }
+
+    function weekOfYear(mom, dow, doy) {
+        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
+            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
+            resWeek,
+            resYear;
+
+        if (week < 1) {
+            resYear = mom.year() - 1;
+            resWeek = week + weeksInYear(resYear, dow, doy);
+        } else if (week > weeksInYear(mom.year(), dow, doy)) {
+            resWeek = week - weeksInYear(mom.year(), dow, doy);
+            resYear = mom.year() + 1;
+        } else {
+            resYear = mom.year();
+            resWeek = week;
+        }
+
+        return {
+            week: resWeek,
+            year: resYear,
+        };
+    }
+
+    function weeksInYear(year, dow, doy) {
+        var weekOffset = firstWeekOffset(year, dow, doy),
+            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
+        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
+    }
+
+    // FORMATTING
+
+    addFormatToken('w', ['ww', 2], 'wo', 'week');
+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+    // PARSING
+
+    addRegexToken('w', match1to2, match1to2NoLeadingZero);
+    addRegexToken('ww', match1to2, match2);
+    addRegexToken('W', match1to2, match1to2NoLeadingZero);
+    addRegexToken('WW', match1to2, match2);
+
+    addWeekParseToken(
+        ['w', 'ww', 'W', 'WW'],
+        function (input, week, config, token) {
+            week[token.substr(0, 1)] = toInt(input);
+        }
+    );
+
+    // HELPERS
+
+    // LOCALES
+
+    function localeWeek(mom) {
+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
+    }
+
+    var defaultLocaleWeek = {
+        dow: 0, // Sunday is the first day of the week.
+        doy: 6, // The week that contains Jan 6th is the first week of the year.
+    };
+
+    function localeFirstDayOfWeek() {
+        return this._week.dow;
+    }
+
+    function localeFirstDayOfYear() {
+        return this._week.doy;
+    }
+
+    // MOMENTS
+
+    function getSetWeek(input) {
+        var week = this.localeData().week(this);
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    function getSetISOWeek(input) {
+        var week = weekOfYear(this, 1, 4).week;
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    // FORMATTING
+
+    addFormatToken('d', 0, 'do', 'day');
+
+    addFormatToken('dd', 0, 0, function (format) {
+        return this.localeData().weekdaysMin(this, format);
+    });
+
+    addFormatToken('ddd', 0, 0, function (format) {
+        return this.localeData().weekdaysShort(this, format);
+    });
+
+    addFormatToken('dddd', 0, 0, function (format) {
+        return this.localeData().weekdays(this, format);
+    });
+
+    addFormatToken('e', 0, 0, 'weekday');
+    addFormatToken('E', 0, 0, 'isoWeekday');
+
+    // PARSING
+
+    addRegexToken('d', match1to2);
+    addRegexToken('e', match1to2);
+    addRegexToken('E', match1to2);
+    addRegexToken('dd', function (isStrict, locale) {
+        return locale.weekdaysMinRegex(isStrict);
+    });
+    addRegexToken('ddd', function (isStrict, locale) {
+        return locale.weekdaysShortRegex(isStrict);
+    });
+    addRegexToken('dddd', function (isStrict, locale) {
+        return locale.weekdaysRegex(isStrict);
+    });
+
+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
+        var weekday = config._locale.weekdaysParse(input, token, config._strict);
+        // if we didn't get a weekday name, mark the date as invalid
+        if (weekday != null) {
+            week.d = weekday;
+        } else {
+            getParsingFlags(config).invalidWeekday = input;
+        }
+    });
+
+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+        week[token] = toInt(input);
+    });
+
+    // HELPERS
+
+    function parseWeekday(input, locale) {
+        if (typeof input !== 'string') {
+            return input;
+        }
+
+        if (!isNaN(input)) {
+            return parseInt(input, 10);
+        }
+
+        input = locale.weekdaysParse(input);
+        if (typeof input === 'number') {
+            return input;
+        }
+
+        return null;
+    }
+
+    function parseIsoWeekday(input, locale) {
+        if (typeof input === 'string') {
+            return locale.weekdaysParse(input) % 7 || 7;
+        }
+        return isNaN(input) ? null : input;
+    }
+
+    // LOCALES
+    function shiftWeekdays(ws, n) {
+        return ws.slice(n, 7).concat(ws.slice(0, n));
+    }
+
+    var defaultLocaleWeekdays =
+            'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        defaultWeekdaysRegex = matchWord,
+        defaultWeekdaysShortRegex = matchWord,
+        defaultWeekdaysMinRegex = matchWord;
+
+    function localeWeekdays(m, format) {
+        var weekdays = isArray(this._weekdays)
+            ? this._weekdays
+            : this._weekdays[
+                  m && m !== true && this._weekdays.isFormat.test(format)
+                      ? 'format'
+                      : 'standalone'
+              ];
+        return m === true
+            ? shiftWeekdays(weekdays, this._week.dow)
+            : m
+              ? weekdays[m.day()]
+              : weekdays;
+    }
+
+    function localeWeekdaysShort(m) {
+        return m === true
+            ? shiftWeekdays(this._weekdaysShort, this._week.dow)
+            : m
+              ? this._weekdaysShort[m.day()]
+              : this._weekdaysShort;
+    }
+
+    function localeWeekdaysMin(m) {
+        return m === true
+            ? shiftWeekdays(this._weekdaysMin, this._week.dow)
+            : m
+              ? this._weekdaysMin[m.day()]
+              : this._weekdaysMin;
+    }
+
+    function handleStrictParse$1(weekdayName, format, strict) {
+        var i,
+            ii,
+            mom,
+            llc = weekdayName.toLocaleLowerCase();
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._minWeekdaysParse = [];
+
+            for (i = 0; i < 7; ++i) {
+                mom = createUTC([2000, 1]).day(i);
+                this._minWeekdaysParse[i] = this.weekdaysMin(
+                    mom,
+                    ''
+                ).toLocaleLowerCase();
+                this._shortWeekdaysParse[i] = this.weekdaysShort(
+                    mom,
+                    ''
+                ).toLocaleLowerCase();
+                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
+            }
+        }
+
+        if (strict) {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
+    }
+
+    function localeWeekdaysParse(weekdayName, format, strict) {
+        var i, mom, regex;
+
+        if (this._weekdaysParseExact) {
+            return handleStrictParse$1.call(this, weekdayName, format, strict);
+        }
+
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._minWeekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._fullWeekdaysParse = [];
+        }
+
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+
+            mom = createUTC([2000, 1]).day(i);
+            if (strict && !this._fullWeekdaysParse[i]) {
+                this._fullWeekdaysParse[i] = new RegExp(
+                    '^' + this.weekdays(mom, '').replace('.', '\\.?') + '$',
+                    'i'
+                );
+                this._shortWeekdaysParse[i] = new RegExp(
+                    '^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$',
+                    'i'
+                );
+                this._minWeekdaysParse[i] = new RegExp(
+                    '^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$',
+                    'i'
+                );
+            }
+            if (!this._weekdaysParse[i]) {
+                regex =
+                    '^' +
+                    this.weekdays(mom, '') +
+                    '|^' +
+                    this.weekdaysShort(mom, '') +
+                    '|^' +
+                    this.weekdaysMin(mom, '');
+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (
+                strict &&
+                format === 'dddd' &&
+                this._fullWeekdaysParse[i].test(weekdayName)
+            ) {
+                return i;
+            } else if (
+                strict &&
+                format === 'ddd' &&
+                this._shortWeekdaysParse[i].test(weekdayName)
+            ) {
+                return i;
+            } else if (
+                strict &&
+                format === 'dd' &&
+                this._minWeekdaysParse[i].test(weekdayName)
+            ) {
+                return i;
+            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function getSetDayOfWeek(input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+
+        var day = get(this, 'Day');
+        if (input != null) {
+            input = parseWeekday(input, this.localeData());
+            return this.add(input - day, 'd');
+        } else {
+            return day;
+        }
+    }
+
+    function getSetLocaleDayOfWeek(input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+        return input == null ? weekday : this.add(input - weekday, 'd');
+    }
+
+    function getSetISODayOfWeek(input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+
+        // behaves the same as moment#day except
+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+        // as a setter, sunday should belong to the previous week.
+
+        if (input != null) {
+            var weekday = parseIsoWeekday(input, this.localeData());
+            return this.day(this.day() % 7 ? weekday : weekday - 7);
+        } else {
+            return this.day() || 7;
+        }
+    }
+
+    function weekdaysRegex(isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysStrictRegex;
+            } else {
+                return this._weekdaysRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                this._weekdaysRegex = defaultWeekdaysRegex;
+            }
+            return this._weekdaysStrictRegex && isStrict
+                ? this._weekdaysStrictRegex
+                : this._weekdaysRegex;
+        }
+    }
+
+    function weekdaysShortRegex(isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysShortStrictRegex;
+            } else {
+                return this._weekdaysShortRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
+                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
+            }
+            return this._weekdaysShortStrictRegex && isStrict
+                ? this._weekdaysShortStrictRegex
+                : this._weekdaysShortRegex;
+        }
+    }
+
+    function weekdaysMinRegex(isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysMinStrictRegex;
+            } else {
+                return this._weekdaysMinRegex;
+            }
+        } else {
+            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
+                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
+            }
+            return this._weekdaysMinStrictRegex && isStrict
+                ? this._weekdaysMinStrictRegex
+                : this._weekdaysMinRegex;
+        }
+    }
+
+    function computeWeekdaysParse() {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
+
+        var minPieces = [],
+            shortPieces = [],
+            longPieces = [],
+            mixedPieces = [],
+            i,
+            mom,
+            minp,
+            shortp,
+            longp;
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+            mom = createUTC([2000, 1]).day(i);
+            minp = regexEscape(this.weekdaysMin(mom, ''));
+            shortp = regexEscape(this.weekdaysShort(mom, ''));
+            longp = regexEscape(this.weekdays(mom, ''));
+            minPieces.push(minp);
+            shortPieces.push(shortp);
+            longPieces.push(longp);
+            mixedPieces.push(minp);
+            mixedPieces.push(shortp);
+            mixedPieces.push(longp);
+        }
+        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
+        // will match the longer piece.
+        minPieces.sort(cmpLenRev);
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+
+        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._weekdaysShortRegex = this._weekdaysRegex;
+        this._weekdaysMinRegex = this._weekdaysRegex;
+
+        this._weekdaysStrictRegex = new RegExp(
+            '^(' + longPieces.join('|') + ')',
+            'i'
+        );
+        this._weekdaysShortStrictRegex = new RegExp(
+            '^(' + shortPieces.join('|') + ')',
+            'i'
+        );
+        this._weekdaysMinStrictRegex = new RegExp(
+            '^(' + minPieces.join('|') + ')',
+            'i'
+        );
+    }
+
+    // FORMATTING
+
+    function hFormat() {
+        return this.hours() % 12 || 12;
+    }
+
+    function kFormat() {
+        return this.hours() || 24;
+    }
+
+    addFormatToken('H', ['HH', 2], 0, 'hour');
+    addFormatToken('h', ['hh', 2], 0, hFormat);
+    addFormatToken('k', ['kk', 2], 0, kFormat);
+
+    addFormatToken('hmm', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
+    });
+
+    addFormatToken('hmmss', 0, 0, function () {
+        return (
+            '' +
+            hFormat.apply(this) +
+            zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2)
+        );
+    });
+
+    addFormatToken('Hmm', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2);
+    });
+
+    addFormatToken('Hmmss', 0, 0, function () {
+        return (
+            '' +
+            this.hours() +
+            zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2)
+        );
+    });
+
+    function meridiem(token, lowercase) {
+        addFormatToken(token, 0, 0, function () {
+            return this.localeData().meridiem(
+                this.hours(),
+                this.minutes(),
+                lowercase
+            );
+        });
+    }
+
+    meridiem('a', true);
+    meridiem('A', false);
+
+    // PARSING
+
+    function matchMeridiem(isStrict, locale) {
+        return locale._meridiemParse;
+    }
+
+    addRegexToken('a', matchMeridiem);
+    addRegexToken('A', matchMeridiem);
+    addRegexToken('H', match1to2, match1to2HasZero);
+    addRegexToken('h', match1to2, match1to2NoLeadingZero);
+    addRegexToken('k', match1to2, match1to2NoLeadingZero);
+    addRegexToken('HH', match1to2, match2);
+    addRegexToken('hh', match1to2, match2);
+    addRegexToken('kk', match1to2, match2);
+
+    addRegexToken('hmm', match3to4);
+    addRegexToken('hmmss', match5to6);
+    addRegexToken('Hmm', match3to4);
+    addRegexToken('Hmmss', match5to6);
+
+    addParseToken(['H', 'HH'], HOUR);
+    addParseToken(['k', 'kk'], function (input, array, config) {
+        var kInput = toInt(input);
+        array[HOUR] = kInput === 24 ? 0 : kInput;
+    });
+    addParseToken(['a', 'A'], function (input, array, config) {
+        config._isPm = config._locale.isPM(input);
+        config._meridiem = input;
+    });
+    addParseToken(['h', 'hh'], function (input, array, config) {
+        array[HOUR] = toInt(input);
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmmss', function (input, array, config) {
+        var pos1 = input.length - 4,
+            pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('Hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+    });
+    addParseToken('Hmmss', function (input, array, config) {
+        var pos1 = input.length - 4,
+            pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+    });
+
+    // LOCALES
+
+    function localeIsPM(input) {
+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+        // Using charAt should be more compatible.
+        return (input + '').toLowerCase().charAt(0) === 'p';
+    }
+
+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i,
+        // Setting the hour should keep the time, because the user explicitly
+        // specified which hour they want. So trying to maintain the same hour (in
+        // a new timezone) makes sense. Adding/subtracting hours does not follow
+        // this rule.
+        getSetHour = makeGetSet('Hours', true);
+
+    function localeMeridiem(hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'pm' : 'PM';
+        } else {
+            return isLower ? 'am' : 'AM';
+        }
+    }
+
+    var baseConfig = {
+        calendar: defaultCalendar,
+        longDateFormat: defaultLongDateFormat,
+        invalidDate: defaultInvalidDate,
+        ordinal: defaultOrdinal,
+        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
+        relativeTime: defaultRelativeTime,
+
+        months: defaultLocaleMonths,
+        monthsShort: defaultLocaleMonthsShort,
+
+        week: defaultLocaleWeek,
+
+        weekdays: defaultLocaleWeekdays,
+        weekdaysMin: defaultLocaleWeekdaysMin,
+        weekdaysShort: defaultLocaleWeekdaysShort,
+
+        meridiemParse: defaultLocaleMeridiemParse,
+    };
+
+    // internal storage for locale config files
+    var locales = {},
+        localeFamilies = {},
+        globalLocale;
+
+    function commonPrefix(arr1, arr2) {
+        var i,
+            minl = Math.min(arr1.length, arr2.length);
+        for (i = 0; i < minl; i += 1) {
+            if (arr1[i] !== arr2[i]) {
+                return i;
+            }
+        }
+        return minl;
+    }
+
+    function normalizeLocale(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
+
+    // pick the locale from the array
+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+    function chooseLocale(names) {
+        var i = 0,
+            j,
+            next,
+            locale,
+            split;
+
+        while (i < names.length) {
+            split = normalizeLocale(names[i]).split('-');
+            j = split.length;
+            next = normalizeLocale(names[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                locale = loadLocale(split.slice(0, j).join('-'));
+                if (locale) {
+                    return locale;
+                }
+                if (
+                    next &&
+                    next.length >= j &&
+                    commonPrefix(split, next) >= j - 1
+                ) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
+        return globalLocale;
+    }
+
+    function isLocaleNameSane(name) {
+        // Prevent names that look like filesystem paths, i.e contain '/' or '\'
+        // Ensure name is available and function returns boolean
+        return !!(name && name.match('^[^/\\\\]*$'));
+    }
+
+    function loadLocale(name) {
+        var oldLocale = null,
+            aliasedRequire;
+        // TODO: Find a better way to register and load all the locales in Node
+        if (
+            locales[name] === undefined &&
+            typeof module !== 'undefined' &&
+            module &&
+            module.exports &&
+            isLocaleNameSane(name)
+        ) {
+            try {
+                oldLocale = globalLocale._abbr;
+                aliasedRequire = require;
+                aliasedRequire('./locale/' + name);
+                getSetGlobalLocale(oldLocale);
+            } catch (e) {
+                // mark as not found to avoid repeating expensive file require call causing high CPU
+                // when trying to find en-US, en_US, en-us for every format call
+                locales[name] = null; // null means not found
+            }
+        }
+        return locales[name];
+    }
+
+    // This function will load locale and then set the global locale.  If
+    // no arguments are passed in, it will simply return the current global
+    // locale key.
+    function getSetGlobalLocale(key, values) {
+        var data;
+        if (key) {
+            if (isUndefined(values)) {
+                data = getLocale(key);
+            } else {
+                data = defineLocale(key, values);
+            }
+
+            if (data) {
+                // moment.duration._locale = moment._locale = data;
+                globalLocale = data;
+            } else {
+                if (typeof console !== 'undefined' && console.warn) {
+                    //warn user if arguments are passed but the locale could not be set
+                    console.warn(
+                        'Locale ' + key + ' not found. Did you forget to load it?'
+                    );
+                }
+            }
+        }
+
+        return globalLocale._abbr;
+    }
+
+    function defineLocale(name, config) {
+        if (config !== null) {
+            var locale,
+                parentConfig = baseConfig;
+            config.abbr = name;
+            if (locales[name] != null) {
+                deprecateSimple(
+                    'defineLocaleOverride',
+                    'use moment.updateLocale(localeName, config) to change ' +
+                        'an existing locale. moment.defineLocale(localeName, ' +
+                        'config) should only be used for creating a new locale ' +
+                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.'
+                );
+                parentConfig = locales[name]._config;
+            } else if (config.parentLocale != null) {
+                if (locales[config.parentLocale] != null) {
+                    parentConfig = locales[config.parentLocale]._config;
+                } else {
+                    locale = loadLocale(config.parentLocale);
+                    if (locale != null) {
+                        parentConfig = locale._config;
+                    } else {
+                        if (!localeFamilies[config.parentLocale]) {
+                            localeFamilies[config.parentLocale] = [];
+                        }
+                        localeFamilies[config.parentLocale].push({
+                            name: name,
+                            config: config,
+                        });
+                        return null;
+                    }
+                }
+            }
+            locales[name] = new Locale(mergeConfigs(parentConfig, config));
+
+            if (localeFamilies[name]) {
+                localeFamilies[name].forEach(function (x) {
+                    defineLocale(x.name, x.config);
+                });
+            }
+
+            // backwards compat for now: also set the locale
+            // make sure we set the locale AFTER all child locales have been
+            // created, so we won't end up with the child locale set.
+            getSetGlobalLocale(name);
+
+            return locales[name];
+        } else {
+            // useful for testing
+            delete locales[name];
+            return null;
+        }
+    }
+
+    function updateLocale(name, config) {
+        if (config != null) {
+            var locale,
+                tmpLocale,
+                parentConfig = baseConfig;
+
+            if (locales[name] != null && locales[name].parentLocale != null) {
+                // Update existing child locale in-place to avoid memory-leaks
+                locales[name].set(mergeConfigs(locales[name]._config, config));
+            } else {
+                // MERGE
+                tmpLocale = loadLocale(name);
+                if (tmpLocale != null) {
+                    parentConfig = tmpLocale._config;
+                }
+                config = mergeConfigs(parentConfig, config);
+                if (tmpLocale == null) {
+                    // updateLocale is called for creating a new locale
+                    // Set abbr so it will have a name (getters return
+                    // undefined otherwise).
+                    config.abbr = name;
+                }
+                locale = new Locale(config);
+                locale.parentLocale = locales[name];
+                locales[name] = locale;
+            }
+
+            // backwards compat for now: also set the locale
+            getSetGlobalLocale(name);
+        } else {
+            // pass null for config to unupdate, useful for tests
+            if (locales[name] != null) {
+                if (locales[name].parentLocale != null) {
+                    locales[name] = locales[name].parentLocale;
+                    if (name === getSetGlobalLocale()) {
+                        getSetGlobalLocale(name);
+                    }
+                } else if (locales[name] != null) {
+                    delete locales[name];
+                }
+            }
+        }
+        return locales[name];
+    }
+
+    // returns locale data
+    function getLocale(key) {
+        var locale;
+
+        if (key && key._locale && key._locale._abbr) {
+            key = key._locale._abbr;
+        }
+
+        if (!key) {
+            return globalLocale;
+        }
+
+        if (!isArray(key)) {
+            //short-circuit everything else
+            locale = loadLocale(key);
+            if (locale) {
+                return locale;
+            }
+            key = [key];
+        }
+
+        return chooseLocale(key);
+    }
+
+    function listLocales() {
+        return keys(locales);
+    }
+
+    function checkOverflow(m) {
+        var overflow,
+            a = m._a;
+
+        if (a && getParsingFlags(m).overflow === -2) {
+            overflow =
+                a[MONTH] < 0 || a[MONTH] > 11
+                    ? MONTH
+                    : a[DATE] < 1 || a[DATE] > daysInMonth(a[YEAR], a[MONTH])
+                      ? DATE
+                      : a[HOUR] < 0 ||
+                          a[HOUR] > 24 ||
+                          (a[HOUR] === 24 &&
+                              (a[MINUTE] !== 0 ||
+                                  a[SECOND] !== 0 ||
+                                  a[MILLISECOND] !== 0))
+                        ? HOUR
+                        : a[MINUTE] < 0 || a[MINUTE] > 59
+                          ? MINUTE
+                          : a[SECOND] < 0 || a[SECOND] > 59
+                            ? SECOND
+                            : a[MILLISECOND] < 0 || a[MILLISECOND] > 999
+                              ? MILLISECOND
+                              : -1;
+
+            if (
+                getParsingFlags(m)._overflowDayOfYear &&
+                (overflow < YEAR || overflow > DATE)
+            ) {
+                overflow = DATE;
+            }
+            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
+                overflow = WEEK;
+            }
+            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
+                overflow = WEEKDAY;
+            }
+
+            getParsingFlags(m).overflow = overflow;
+        }
+
+        return m;
+    }
+
+    // iso 8601 regex
+    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+    var extendedIsoRegex =
+            /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+        basicIsoRegex =
+            /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,
+        tzRegex = /Z|[+-]\d\d(?::?\d\d)?/,
+        isoDates = [
+            ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
+            ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
+            ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
+            ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
+            ['YYYY-DDD', /\d{4}-\d{3}/],
+            ['YYYY-MM', /\d{4}-\d\d/, false],
+            ['YYYYYYMMDD', /[+-]\d{10}/],
+            ['YYYYMMDD', /\d{8}/],
+            ['GGGG[W]WWE', /\d{4}W\d{3}/],
+            ['GGGG[W]WW', /\d{4}W\d{2}/, false],
+            ['YYYYDDD', /\d{7}/],
+            ['YYYYMM', /\d{6}/, false],
+            ['YYYY', /\d{4}/, false],
+        ],
+        // iso time formats and regexes
+        isoTimes = [
+            ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
+            ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
+            ['HH:mm:ss', /\d\d:\d\d:\d\d/],
+            ['HH:mm', /\d\d:\d\d/],
+            ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
+            ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
+            ['HHmmss', /\d\d\d\d\d\d/],
+            ['HHmm', /\d\d\d\d/],
+            ['HH', /\d\d/],
+        ],
+        aspNetJsonRegex = /^\/?Date\((-?\d+)/i,
+        // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
+        rfc2822 =
+            /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,
+        obsOffsets = {
+            UT: 0,
+            GMT: 0,
+            EDT: -4 * 60,
+            EST: -5 * 60,
+            CDT: -5 * 60,
+            CST: -6 * 60,
+            MDT: -6 * 60,
+            MST: -7 * 60,
+            PDT: -7 * 60,
+            PST: -8 * 60,
+        };
+
+    // date from iso format
+    function configFromISO(config) {
+        var i,
+            l,
+            string = config._i,
+            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
+            allowTime,
+            dateFormat,
+            timeFormat,
+            tzFormat,
+            isoDatesLen = isoDates.length,
+            isoTimesLen = isoTimes.length;
+
+        if (match) {
+            getParsingFlags(config).iso = true;
+            for (i = 0, l = isoDatesLen; i < l; i++) {
+                if (isoDates[i][1].exec(match[1])) {
+                    dateFormat = isoDates[i][0];
+                    allowTime = isoDates[i][2] !== false;
+                    break;
+                }
+            }
+            if (dateFormat == null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[3]) {
+                for (i = 0, l = isoTimesLen; i < l; i++) {
+                    if (isoTimes[i][1].exec(match[3])) {
+                        // match[2] should be 'T' or space
+                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
+                        break;
+                    }
+                }
+                if (timeFormat == null) {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            if (!allowTime && timeFormat != null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[4]) {
+                if (tzRegex.exec(match[4])) {
+                    tzFormat = 'Z';
+                } else {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
+            configFromStringAndFormat(config);
+        } else {
+            config._isValid = false;
+        }
+    }
+
+    function extractFromRFC2822Strings(
+        yearStr,
+        monthStr,
+        dayStr,
+        hourStr,
+        minuteStr,
+        secondStr
+    ) {
+        var result = [
+            untruncateYear(yearStr),
+            defaultLocaleMonthsShort.indexOf(monthStr),
+            parseInt(dayStr, 10),
+            parseInt(hourStr, 10),
+            parseInt(minuteStr, 10),
+        ];
+
+        if (secondStr) {
+            result.push(parseInt(secondStr, 10));
+        }
+
+        return result;
+    }
+
+    function untruncateYear(yearStr) {
+        var year = parseInt(yearStr, 10);
+        if (year <= 49) {
+            return 2000 + year;
+        } else if (year <= 999) {
+            return 1900 + year;
+        }
+        return year;
+    }
+
+    function preprocessRFC2822(s) {
+        // Remove comments and folding whitespace and replace multiple-spaces with a single space
+        return s
+            .replace(/\([^()]*\)|[\n\t]/g, ' ')
+            .replace(/(\s\s+)/g, ' ')
+            .replace(/^\s\s*/, '')
+            .replace(/\s\s*$/, '');
+    }
+
+    function checkWeekday(weekdayStr, parsedInput, config) {
+        if (weekdayStr) {
+            // TODO: Replace the vanilla JS Date object with an independent day-of-week check.
+            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
+                weekdayActual = new Date(
+                    parsedInput[0],
+                    parsedInput[1],
+                    parsedInput[2]
+                ).getDay();
+            if (weekdayProvided !== weekdayActual) {
+                getParsingFlags(config).weekdayMismatch = true;
+                config._isValid = false;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function calculateOffset(obsOffset, militaryOffset, numOffset) {
+        if (obsOffset) {
+            return obsOffsets[obsOffset];
+        } else if (militaryOffset) {
+            // the only allowed military tz is Z
+            return 0;
+        } else {
+            var hm = parseInt(numOffset, 10),
+                m = hm % 100,
+                h = (hm - m) / 100;
+            return h * 60 + m;
+        }
+    }
+
+    // date and time from ref 2822 format
+    function configFromRFC2822(config) {
+        var match = rfc2822.exec(preprocessRFC2822(config._i)),
+            parsedArray;
+        if (match) {
+            parsedArray = extractFromRFC2822Strings(
+                match[4],
+                match[3],
+                match[2],
+                match[5],
+                match[6],
+                match[7]
+            );
+            if (!checkWeekday(match[1], parsedArray, config)) {
+                return;
+            }
+
+            config._a = parsedArray;
+            config._tzm = calculateOffset(match[8], match[9], match[10]);
+
+            config._d = createUTCDate.apply(null, config._a);
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+
+            getParsingFlags(config).rfc2822 = true;
+        } else {
+            config._isValid = false;
+        }
+    }
+
+    // date from 1) ASP.NET, 2) ISO, 3) RFC 2822 formats, or 4) optional fallback if parsing isn't strict
+    function configFromString(config) {
+        var matched = aspNetJsonRegex.exec(config._i);
+        if (matched !== null) {
+            config._d = new Date(+matched[1]);
+            return;
+        }
+
+        configFromISO(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+        } else {
+            return;
+        }
+
+        configFromRFC2822(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+        } else {
+            return;
+        }
+
+        if (config._strict) {
+            config._isValid = false;
+        } else {
+            // Final attempt, use Input Fallback
+            hooks.createFromInputFallback(config);
+        }
+    }
+
+    hooks.createFromInputFallback = deprecate(
+        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
+            'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
+            'discouraged. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.',
+        function (config) {
+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+        }
+    );
+
+    // Pick the first defined of two or three arguments.
+    function defaults(a, b, c) {
+        if (a != null) {
+            return a;
+        }
+        if (b != null) {
+            return b;
+        }
+        return c;
+    }
+
+    function currentDateArray(config) {
+        // hooks is actually the exported moment object
+        var nowValue = new Date(hooks.now());
+        if (config._useUTC) {
+            return [
+                nowValue.getUTCFullYear(),
+                nowValue.getUTCMonth(),
+                nowValue.getUTCDate(),
+            ];
+        }
+        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
+    }
+
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function configFromArray(config) {
+        var i,
+            date,
+            input = [],
+            currentDate,
+            expectedWeekday,
+            yearToUse;
+
+        if (config._d) {
+            return;
+        }
+
+        currentDate = currentDateArray(config);
+
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            dayOfYearFromWeekInfo(config);
+        }
+
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear != null) {
+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+            if (
+                config._dayOfYear > daysInYear(yearToUse) ||
+                config._dayOfYear === 0
+            ) {
+                getParsingFlags(config)._overflowDayOfYear = true;
+            }
+
+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
+
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] =
+                config._a[i] == null ? (i === 2 ? 1 : 0) : config._a[i];
+        }
+
+        // Check for 24:00:00.000
+        if (
+            config._a[HOUR] === 24 &&
+            config._a[MINUTE] === 0 &&
+            config._a[SECOND] === 0 &&
+            config._a[MILLISECOND] === 0
+        ) {
+            config._nextDay = true;
+            config._a[HOUR] = 0;
+        }
+
+        config._d = (config._useUTC ? createUTCDate : createDate).apply(
+            null,
+            input
+        );
+        expectedWeekday = config._useUTC
+            ? config._d.getUTCDay()
+            : config._d.getDay();
+
+        // Apply timezone offset from input. The actual utcOffset can be changed
+        // with parseZone.
+        if (config._tzm != null) {
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+        }
+
+        if (config._nextDay) {
+            config._a[HOUR] = 24;
+        }
+
+        // check for mismatching day of week
+        if (
+            config._w &&
+            typeof config._w.d !== 'undefined' &&
+            config._w.d !== expectedWeekday
+        ) {
+            getParsingFlags(config).weekdayMismatch = true;
+        }
+    }
+
+    function dayOfYearFromWeekInfo(config) {
+        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow, curWeek;
+
+        w = config._w;
+        if (w.GG != null || w.W != null || w.E != null) {
+            dow = 1;
+            doy = 4;
+
+            // TODO: We need to take the current isoWeekYear, but that depends on
+            // how we interpret now (local, utc, fixed offset). So create
+            // a now version of current config (take local/utc/offset flags, and
+            // create now).
+            weekYear = defaults(
+                w.GG,
+                config._a[YEAR],
+                weekOfYear(createLocal(), 1, 4).year
+            );
+            week = defaults(w.W, 1);
+            weekday = defaults(w.E, 1);
+            if (weekday < 1 || weekday > 7) {
+                weekdayOverflow = true;
+            }
+        } else {
+            dow = config._locale._week.dow;
+            doy = config._locale._week.doy;
+
+            curWeek = weekOfYear(createLocal(), dow, doy);
+
+            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
+
+            // Default to current week.
+            week = defaults(w.w, curWeek.week);
+
+            if (w.d != null) {
+                // weekday -- low day numbers are considered next week
+                weekday = w.d;
+                if (weekday < 0 || weekday > 6) {
+                    weekdayOverflow = true;
+                }
+            } else if (w.e != null) {
+                // local weekday -- counting starts from beginning of week
+                weekday = w.e + dow;
+                if (w.e < 0 || w.e > 6) {
+                    weekdayOverflow = true;
+                }
+            } else {
+                // default to beginning of week
+                weekday = dow;
+            }
+        }
+        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
+            getParsingFlags(config)._overflowWeeks = true;
+        } else if (weekdayOverflow != null) {
+            getParsingFlags(config)._overflowWeekday = true;
+        } else {
+            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
+            config._a[YEAR] = temp.year;
+            config._dayOfYear = temp.dayOfYear;
+        }
+    }
+
+    // constant that refers to the ISO standard
+    hooks.ISO_8601 = function () {};
+
+    // constant that refers to the RFC 2822 form
+    hooks.RFC_2822 = function () {};
+
+    // date from string and format string
+    function configFromStringAndFormat(config) {
+        // TODO: Move this to another part of the creation flow to prevent circular deps
+        if (config._f === hooks.ISO_8601) {
+            configFromISO(config);
+            return;
+        }
+        if (config._f === hooks.RFC_2822) {
+            configFromRFC2822(config);
+            return;
+        }
+        config._a = [];
+        getParsingFlags(config).empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var string = '' + config._i,
+            i,
+            parsedInput,
+            tokens,
+            token,
+            skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0,
+            era,
+            tokenLen;
+
+        tokens =
+            expandFormat(config._f, config._locale).match(formattingTokens) || [];
+        tokenLen = tokens.length;
+        for (i = 0; i < tokenLen; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) ||
+                [])[0];
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    getParsingFlags(config).unusedInput.push(skipped);
+                }
+                string = string.slice(
+                    string.indexOf(parsedInput) + parsedInput.length
+                );
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    getParsingFlags(config).empty = false;
+                } else {
+                    getParsingFlags(config).unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            } else if (config._strict && !parsedInput) {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
+        }
+
+        // add remaining unparsed input length to the string
+        getParsingFlags(config).charsLeftOver =
+            stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            getParsingFlags(config).unusedInput.push(string);
+        }
+
+        // clear _12h flag if hour is <= 12
+        if (
+            config._a[HOUR] <= 12 &&
+            getParsingFlags(config).bigHour === true &&
+            config._a[HOUR] > 0
+        ) {
+            getParsingFlags(config).bigHour = undefined;
+        }
+
+        getParsingFlags(config).parsedDateParts = config._a.slice(0);
+        getParsingFlags(config).meridiem = config._meridiem;
+        // handle meridiem
+        config._a[HOUR] = meridiemFixWrap(
+            config._locale,
+            config._a[HOUR],
+            config._meridiem
+        );
+
+        // handle era
+        era = getParsingFlags(config).era;
+        if (era !== null) {
+            config._a[YEAR] = config._locale.erasConvertYear(era, config._a[YEAR]);
+        }
+
+        configFromArray(config);
+        checkOverflow(config);
+    }
+
+    function meridiemFixWrap(locale, hour, meridiem) {
+        var isPm;
+
+        if (meridiem == null) {
+            // nothing to do
+            return hour;
+        }
+        if (locale.meridiemHour != null) {
+            return locale.meridiemHour(hour, meridiem);
+        } else if (locale.isPM != null) {
+            // Fallback
+            isPm = locale.isPM(meridiem);
+            if (isPm && hour < 12) {
+                hour += 12;
+            }
+            if (!isPm && hour === 12) {
+                hour = 0;
+            }
+            return hour;
+        } else {
+            // this is not supposed to happen
+            return hour;
+        }
+    }
+
+    // date from string and array of format strings
+    function configFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
+            scoreToBeat,
+            i,
+            currentScore,
+            validFormatFound,
+            bestFormatIsValid = false,
+            configfLen = config._f.length;
+
+        if (configfLen === 0) {
+            getParsingFlags(config).invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
+
+        for (i = 0; i < configfLen; i++) {
+            currentScore = 0;
+            validFormatFound = false;
+            tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
+            tempConfig._f = config._f[i];
+            configFromStringAndFormat(tempConfig);
+
+            if (isValid(tempConfig)) {
+                validFormatFound = true;
+            }
+
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+            //or tokens
+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+            getParsingFlags(tempConfig).score = currentScore;
+
+            if (!bestFormatIsValid) {
+                if (
+                    scoreToBeat == null ||
+                    currentScore < scoreToBeat ||
+                    validFormatFound
+                ) {
+                    scoreToBeat = currentScore;
+                    bestMoment = tempConfig;
+                    if (validFormatFound) {
+                        bestFormatIsValid = true;
+                    }
+                }
+            } else {
+                if (currentScore < scoreToBeat) {
+                    scoreToBeat = currentScore;
+                    bestMoment = tempConfig;
+                }
+            }
+        }
+
+        extend(config, bestMoment || tempConfig);
+    }
+
+    function configFromObject(config) {
+        if (config._d) {
+            return;
+        }
+
+        var i = normalizeObjectUnits(config._i),
+            dayOrDate = i.day === undefined ? i.date : i.day;
+        config._a = map(
+            [i.year, i.month, dayOrDate, i.hour, i.minute, i.second, i.millisecond],
+            function (obj) {
+                return obj && parseInt(obj, 10);
+            }
+        );
+
+        configFromArray(config);
+    }
+
+    function createFromConfig(config) {
+        var res = new Moment(checkOverflow(prepareConfig(config)));
+        if (res._nextDay) {
+            // Adding is smart enough around DST
+            res.add(1, 'd');
+            res._nextDay = undefined;
+        }
+
+        return res;
+    }
+
+    function prepareConfig(config) {
+        var input = config._i,
+            format = config._f;
+
+        config._locale = config._locale || getLocale(config._l);
+
+        if (input === null || (format === undefined && input === '')) {
+            return createInvalid({ nullInput: true });
+        }
+
+        if (typeof input === 'string') {
+            config._i = input = config._locale.preparse(input);
+        }
+
+        if (isMoment(input)) {
+            return new Moment(checkOverflow(input));
+        } else if (isDate(input)) {
+            config._d = input;
+        } else if (isArray(format)) {
+            configFromStringAndArray(config);
+        } else if (format) {
+            configFromStringAndFormat(config);
+        } else {
+            configFromInput(config);
+        }
+
+        if (!isValid(config)) {
+            config._d = null;
+        }
+
+        return config;
+    }
+
+    function configFromInput(config) {
+        var input = config._i;
+        if (isUndefined(input)) {
+            config._d = new Date(hooks.now());
+        } else if (isDate(input)) {
+            config._d = new Date(input.valueOf());
+        } else if (typeof input === 'string') {
+            configFromString(config);
+        } else if (isArray(input)) {
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
+            configFromArray(config);
+        } else if (isObject(input)) {
+            configFromObject(config);
+        } else if (isNumber(input)) {
+            // from milliseconds
+            config._d = new Date(input);
+        } else {
+            hooks.createFromInputFallback(config);
+        }
+    }
+
+    function createLocalOrUTC(input, format, locale, strict, isUTC) {
+        var c = {};
+
+        if (format === true || format === false) {
+            strict = format;
+            format = undefined;
+        }
+
+        if (locale === true || locale === false) {
+            strict = locale;
+            locale = undefined;
+        }
+
+        if (
+            (isObject(input) && isObjectEmpty(input)) ||
+            (isArray(input) && input.length === 0)
+        ) {
+            input = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c._isAMomentObject = true;
+        c._useUTC = c._isUTC = isUTC;
+        c._l = locale;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
+
+        return createFromConfig(c);
+    }
+
+    function createLocal(input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, false);
+    }
+
+    var prototypeMin = deprecate(
+            'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
+            function () {
+                var other = createLocal.apply(null, arguments);
+                if (this.isValid() && other.isValid()) {
+                    return other < this ? this : other;
+                } else {
+                    return createInvalid();
+                }
+            }
+        ),
+        prototypeMax = deprecate(
+            'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
+            function () {
+                var other = createLocal.apply(null, arguments);
+                if (this.isValid() && other.isValid()) {
+                    return other > this ? this : other;
+                } else {
+                    return createInvalid();
+                }
+            }
+        );
+
+    // Pick a moment m from moments so that m[fn](other) is true for all
+    // other. This relies on the function fn to be transitive.
+    //
+    // moments should either be an array of moment objects or an array, whose
+    // first element is an array of moment objects.
+    function pickBy(fn, moments) {
+        var res, i;
+        if (moments.length === 1 && isArray(moments[0])) {
+            moments = moments[0];
+        }
+        if (!moments.length) {
+            return createLocal();
+        }
+        res = moments[0];
+        for (i = 1; i < moments.length; ++i) {
+            if (!moments[i].isValid() || moments[i][fn](res)) {
+                res = moments[i];
+            }
+        }
+        return res;
+    }
+
+    // TODO: Use [].sort instead?
+    function min() {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isBefore', args);
+    }
+
+    function max() {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isAfter', args);
+    }
+
+    var now = function () {
+        return Date.now ? Date.now() : +new Date();
+    };
+
+    var ordering = [
+        'year',
+        'quarter',
+        'month',
+        'week',
+        'day',
+        'hour',
+        'minute',
+        'second',
+        'millisecond',
+    ];
+
+    function isDurationValid(m) {
+        var key,
+            unitHasDecimal = false,
+            i,
+            orderLen = ordering.length;
+        for (key in m) {
+            if (
+                hasOwnProp(m, key) &&
+                !(
+                    indexOf.call(ordering, key) !== -1 &&
+                    (m[key] == null || !isNaN(m[key]))
+                )
+            ) {
+                return false;
+            }
+        }
+
+        for (i = 0; i < orderLen; ++i) {
+            if (m[ordering[i]]) {
+                if (unitHasDecimal) {
+                    return false; // only allow non-integers for smallest unit
+                }
+                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
+                    unitHasDecimal = true;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    function isValid$1() {
+        return this._isValid;
+    }
+
+    function createInvalid$1() {
+        return createDuration(NaN);
+    }
+
+    function Duration(duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            quarters = normalizedInput.quarter || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || normalizedInput.isoWeek || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
+
+        this._isValid = isDurationValid(normalizedInput);
+
+        // representation for dateAddRemove
+        this._milliseconds =
+            +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days + weeks * 7;
+        // It is impossible to translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months + quarters * 3 + years * 12;
+
+        this._data = {};
+
+        this._locale = getLocale();
+
+        this._bubble();
+    }
+
+    function isDuration(obj) {
+        return obj instanceof Duration;
+    }
+
+    function absRound(number) {
+        if (number < 0) {
+            return Math.round(-1 * number) * -1;
+        } else {
+            return Math.round(number);
+        }
+    }
+
+    // compare two arrays, return the number of differences
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if (
+                (dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))
+            ) {
+                diffs++;
+            }
+        }
+        return diffs + lengthDiff;
+    }
+
+    // FORMATTING
+
+    function offset(token, separator) {
+        addFormatToken(token, 0, 0, function () {
+            var offset = this.utcOffset(),
+                sign = '+';
+            if (offset < 0) {
+                offset = -offset;
+                sign = '-';
+            }
+            return (
+                sign +
+                zeroFill(~~(offset / 60), 2) +
+                separator +
+                zeroFill(~~offset % 60, 2)
+            );
+        });
+    }
+
+    offset('Z', ':');
+    offset('ZZ', '');
+
+    // PARSING
+
+    addRegexToken('Z', matchShortOffset);
+    addRegexToken('ZZ', matchShortOffset);
+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
+        config._useUTC = true;
+        config._tzm = offsetFromString(matchShortOffset, input);
+    });
+
+    // HELPERS
+
+    // timezone chunker
+    // '+10:00' > ['10',  '00']
+    // '-1530'  > ['-15', '30']
+    var chunkOffset = /([\+\-]|\d\d)/gi;
+
+    function offsetFromString(matcher, string) {
+        var matches = (string || '').match(matcher),
+            chunk,
+            parts,
+            minutes;
+
+        if (matches === null) {
+            return null;
+        }
+
+        chunk = matches[matches.length - 1] || [];
+        parts = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+        minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return minutes === 0 ? 0 : parts[0] === '+' ? minutes : -minutes;
+    }
+
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function cloneWithOffset(input, model) {
+        var res, diff;
+        if (model._isUTC) {
+            res = model.clone();
+            diff =
+                (isMoment(input) || isDate(input)
+                    ? input.valueOf()
+                    : createLocal(input).valueOf()) - res.valueOf();
+            // Use low-level api, because this fn is low-level api.
+            res._d.setTime(res._d.valueOf() + diff);
+            hooks.updateOffset(res, false);
+            return res;
+        } else {
+            return createLocal(input).local();
+        }
+    }
+
+    function getDateOffset(m) {
+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+        // https://github.com/moment/moment/pull/1871
+        return -Math.round(m._d.getTimezoneOffset());
+    }
+
+    // HOOKS
+
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    hooks.updateOffset = function () {};
+
+    // MOMENTS
+
+    // keepLocalTime = true means only change the timezone, without
+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+    // +0200, so we adjust the time as needed, to be valid.
+    //
+    // Keeping the time actually adds/subtracts (one hour)
+    // from the actual represented time. That is why we call updateOffset
+    // a second time. In case it wants us to change the offset again
+    // _changeInProgress == true case, then we have to adjust, because
+    // there is no such time in the given timezone.
+    function getSetOffset(input, keepLocalTime, keepMinutes) {
+        var offset = this._offset || 0,
+            localAdjust;
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        if (input != null) {
+            if (typeof input === 'string') {
+                input = offsetFromString(matchShortOffset, input);
+                if (input === null) {
+                    return this;
+                }
+            } else if (Math.abs(input) < 16 && !keepMinutes) {
+                input = input * 60;
+            }
+            if (!this._isUTC && keepLocalTime) {
+                localAdjust = getDateOffset(this);
+            }
+            this._offset = input;
+            this._isUTC = true;
+            if (localAdjust != null) {
+                this.add(localAdjust, 'm');
+            }
+            if (offset !== input) {
+                if (!keepLocalTime || this._changeInProgress) {
+                    addSubtract(
+                        this,
+                        createDuration(input - offset, 'm'),
+                        1,
+                        false
+                    );
+                } else if (!this._changeInProgress) {
+                    this._changeInProgress = true;
+                    hooks.updateOffset(this, true);
+                    this._changeInProgress = null;
+                }
+            }
+            return this;
+        } else {
+            return this._isUTC ? offset : getDateOffset(this);
+        }
+    }
+
+    function getSetZone(input, keepLocalTime) {
+        if (input != null) {
+            if (typeof input !== 'string') {
+                input = -input;
+            }
+
+            this.utcOffset(input, keepLocalTime);
+
+            return this;
+        } else {
+            return -this.utcOffset();
+        }
+    }
+
+    function setOffsetToUTC(keepLocalTime) {
+        return this.utcOffset(0, keepLocalTime);
+    }
+
+    function setOffsetToLocal(keepLocalTime) {
+        if (this._isUTC) {
+            this.utcOffset(0, keepLocalTime);
+            this._isUTC = false;
+
+            if (keepLocalTime) {
+                this.subtract(getDateOffset(this), 'm');
+            }
+        }
+        return this;
+    }
+
+    function setOffsetToParsedOffset() {
+        if (this._tzm != null) {
+            this.utcOffset(this._tzm, false, true);
+        } else if (typeof this._i === 'string') {
+            var tZone = offsetFromString(matchOffset, this._i);
+            if (tZone != null) {
+                this.utcOffset(tZone);
+            } else {
+                this.utcOffset(0, true);
+            }
+        }
+        return this;
+    }
+
+    function hasAlignedHourOffset(input) {
+        if (!this.isValid()) {
+            return false;
+        }
+        input = input ? createLocal(input).utcOffset() : 0;
+
+        return (this.utcOffset() - input) % 60 === 0;
+    }
+
+    function isDaylightSavingTime() {
+        return (
+            this.utcOffset() > this.clone().month(0).utcOffset() ||
+            this.utcOffset() > this.clone().month(5).utcOffset()
+        );
+    }
+
+    function isDaylightSavingTimeShifted() {
+        if (!isUndefined(this._isDSTShifted)) {
+            return this._isDSTShifted;
+        }
+
+        var c = {},
+            other;
+
+        copyConfig(c, this);
+        c = prepareConfig(c);
+
+        if (c._a) {
+            other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
+            this._isDSTShifted =
+                this.isValid() && compareArrays(c._a, other.toArray()) > 0;
+        } else {
+            this._isDSTShifted = false;
+        }
+
+        return this._isDSTShifted;
+    }
+
+    function isLocal() {
+        return this.isValid() ? !this._isUTC : false;
+    }
+
+    function isUtcOffset() {
+        return this.isValid() ? this._isUTC : false;
+    }
+
+    function isUtc() {
+        return this.isValid() ? this._isUTC && this._offset === 0 : false;
+    }
+
+    // ASP.NET json date format regex
+    var aspNetRegex = /^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/,
+        // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+        // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+        // and further modified to allow for strings containing both week and day
+        isoRegex =
+            /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
+
+    function createDuration(input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            diffRes;
+
+        if (isDuration(input)) {
+            duration = {
+                ms: input._milliseconds,
+                d: input._days,
+                M: input._months,
+            };
+        } else if (isNumber(input) || !isNaN(+input)) {
+            duration = {};
+            if (key) {
+                duration[key] = +input;
+            } else {
+                duration.milliseconds = +input;
+            }
+        } else if ((match = aspNetRegex.exec(input))) {
+            sign = match[1] === '-' ? -1 : 1;
+            duration = {
+                y: 0,
+                d: toInt(match[DATE]) * sign,
+                h: toInt(match[HOUR]) * sign,
+                m: toInt(match[MINUTE]) * sign,
+                s: toInt(match[SECOND]) * sign,
+                ms: toInt(absRound(match[MILLISECOND] * 1000)) * sign, // the millisecond decimal point is included in the match
+            };
+        } else if ((match = isoRegex.exec(input))) {
+            sign = match[1] === '-' ? -1 : 1;
+            duration = {
+                y: parseIso(match[2], sign),
+                M: parseIso(match[3], sign),
+                w: parseIso(match[4], sign),
+                d: parseIso(match[5], sign),
+                h: parseIso(match[6], sign),
+                m: parseIso(match[7], sign),
+                s: parseIso(match[8], sign),
+            };
+        } else if (duration == null) {
+            // checks for null or undefined
+            duration = {};
+        } else if (
+            typeof duration === 'object' &&
+            ('from' in duration || 'to' in duration)
+        ) {
+            diffRes = momentsDifference(
+                createLocal(duration.from),
+                createLocal(duration.to)
+            );
+
+            duration = {};
+            duration.ms = diffRes.milliseconds;
+            duration.M = diffRes.months;
+        }
+
+        ret = new Duration(duration);
+
+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
+            ret._locale = input._locale;
+        }
+
+        if (isDuration(input) && hasOwnProp(input, '_isValid')) {
+            ret._isValid = input._isValid;
+        }
+
+        return ret;
+    }
+
+    createDuration.fn = Duration.prototype;
+    createDuration.invalid = createInvalid$1;
+
+    function parseIso(inp, sign) {
+        // We'd normally use ~~inp for this, but unfortunately it also
+        // converts floats to ints.
+        // inp may be undefined, so careful calling replace on it.
+        var res = inp && parseFloat(inp.replace(',', '.'));
+        // apply sign while we're at it
+        return (isNaN(res) ? 0 : res) * sign;
+    }
+
+    function positiveMomentsDifference(base, other) {
+        var res = {};
+
+        res.months =
+            other.month() - base.month() + (other.year() - base.year()) * 12;
+        if (base.clone().add(res.months, 'M').isAfter(other)) {
+            --res.months;
+        }
+
+        res.milliseconds = +other - +base.clone().add(res.months, 'M');
+
+        return res;
+    }
+
+    function momentsDifference(base, other) {
+        var res;
+        if (!(base.isValid() && other.isValid())) {
+            return { milliseconds: 0, months: 0 };
+        }
+
+        other = cloneWithOffset(other, base);
+        if (base.isBefore(other)) {
+            res = positiveMomentsDifference(base, other);
+        } else {
+            res = positiveMomentsDifference(other, base);
+            res.milliseconds = -res.milliseconds;
+            res.months = -res.months;
+        }
+
+        return res;
+    }
+
+    // TODO: remove 'name' arg after deprecation is removed
+    function createAdder(direction, name) {
+        return function (val, period) {
+            var dur, tmp;
+            //invert the arguments, but complain about it
+            if (period !== null && !isNaN(+period)) {
+                deprecateSimple(
+                    name,
+                    'moment().' +
+                        name +
+                        '(period, number) is deprecated. Please use moment().' +
+                        name +
+                        '(number, period). ' +
+                        'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.'
+                );
+                tmp = val;
+                val = period;
+                period = tmp;
+            }
+
+            dur = createDuration(val, period);
+            addSubtract(this, dur, direction);
+            return this;
+        };
+    }
+
+    function addSubtract(mom, duration, isAdding, updateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = absRound(duration._days),
+            months = absRound(duration._months);
+
+        if (!mom.isValid()) {
+            // No op
+            return;
+        }
+
+        updateOffset = updateOffset == null ? true : updateOffset;
+
+        if (months) {
+            setMonth(mom, get(mom, 'Month') + months * isAdding);
+        }
+        if (days) {
+            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
+        }
+        if (milliseconds) {
+            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
+        }
+        if (updateOffset) {
+            hooks.updateOffset(mom, days || months);
+        }
+    }
+
+    var add = createAdder(1, 'add'),
+        subtract = createAdder(-1, 'subtract');
+
+    function isString(input) {
+        return typeof input === 'string' || input instanceof String;
+    }
+
+    // type MomentInput = Moment | Date | string | number | (number | string)[] | MomentInputObject | void; // null | undefined
+    function isMomentInput(input) {
+        return (
+            isMoment(input) ||
+            isDate(input) ||
+            isString(input) ||
+            isNumber(input) ||
+            isNumberOrStringArray(input) ||
+            isMomentInputObject(input) ||
+            input === null ||
+            input === undefined
+        );
+    }
+
+    function isMomentInputObject(input) {
+        var objectTest = isObject(input) && !isObjectEmpty(input),
+            propertyTest = false,
+            properties = [
+                'years',
+                'year',
+                'y',
+                'months',
+                'month',
+                'M',
+                'days',
+                'day',
+                'd',
+                'dates',
+                'date',
+                'D',
+                'hours',
+                'hour',
+                'h',
+                'minutes',
+                'minute',
+                'm',
+                'seconds',
+                'second',
+                's',
+                'milliseconds',
+                'millisecond',
+                'ms',
+            ],
+            i,
+            property,
+            propertyLen = properties.length;
+
+        for (i = 0; i < propertyLen; i += 1) {
+            property = properties[i];
+            propertyTest = propertyTest || hasOwnProp(input, property);
+        }
+
+        return objectTest && propertyTest;
+    }
+
+    function isNumberOrStringArray(input) {
+        var arrayTest = isArray(input),
+            dataTypeTest = false;
+        if (arrayTest) {
+            dataTypeTest =
+                input.filter(function (item) {
+                    return !isNumber(item) && isString(input);
+                }).length === 0;
+        }
+        return arrayTest && dataTypeTest;
+    }
+
+    function isCalendarSpec(input) {
+        var objectTest = isObject(input) && !isObjectEmpty(input),
+            propertyTest = false,
+            properties = [
+                'sameDay',
+                'nextDay',
+                'lastDay',
+                'nextWeek',
+                'lastWeek',
+                'sameElse',
+            ],
+            i,
+            property;
+
+        for (i = 0; i < properties.length; i += 1) {
+            property = properties[i];
+            propertyTest = propertyTest || hasOwnProp(input, property);
+        }
+
+        return objectTest && propertyTest;
+    }
+
+    function getCalendarFormat(myMoment, now) {
+        var diff = myMoment.diff(now, 'days', true);
+        return diff < -6
+            ? 'sameElse'
+            : diff < -1
+              ? 'lastWeek'
+              : diff < 0
+                ? 'lastDay'
+                : diff < 1
+                  ? 'sameDay'
+                  : diff < 2
+                    ? 'nextDay'
+                    : diff < 7
+                      ? 'nextWeek'
+                      : 'sameElse';
+    }
+
+    function calendar$1(time, formats) {
+        // Support for single parameter, formats only overload to the calendar function
+        if (arguments.length === 1) {
+            if (!arguments[0]) {
+                time = undefined;
+                formats = undefined;
+            } else if (isMomentInput(arguments[0])) {
+                time = arguments[0];
+                formats = undefined;
+            } else if (isCalendarSpec(arguments[0])) {
+                formats = arguments[0];
+                time = undefined;
+            }
+        }
+        // We want to compare the start of today, vs this.
+        // Getting start-of-today depends on whether we're local/utc/offset or not.
+        var now = time || createLocal(),
+            sod = cloneWithOffset(now, this).startOf('day'),
+            format = hooks.calendarFormat(this, sod) || 'sameElse',
+            output =
+                formats &&
+                (isFunction(formats[format])
+                    ? formats[format].call(this, now)
+                    : formats[format]);
+
+        return this.format(
+            output || this.localeData().calendar(format, this, createLocal(now))
+        );
+    }
+
+    function clone() {
+        return new Moment(this);
+    }
+
+    function isAfter(input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units) || 'millisecond';
+        if (units === 'millisecond') {
+            return this.valueOf() > localInput.valueOf();
+        } else {
+            return localInput.valueOf() < this.clone().startOf(units).valueOf();
+        }
+    }
+
+    function isBefore(input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units) || 'millisecond';
+        if (units === 'millisecond') {
+            return this.valueOf() < localInput.valueOf();
+        } else {
+            return this.clone().endOf(units).valueOf() < localInput.valueOf();
+        }
+    }
+
+    function isBetween(from, to, units, inclusivity) {
+        var localFrom = isMoment(from) ? from : createLocal(from),
+            localTo = isMoment(to) ? to : createLocal(to);
+        if (!(this.isValid() && localFrom.isValid() && localTo.isValid())) {
+            return false;
+        }
+        inclusivity = inclusivity || '()';
+        return (
+            (inclusivity[0] === '('
+                ? this.isAfter(localFrom, units)
+                : !this.isBefore(localFrom, units)) &&
+            (inclusivity[1] === ')'
+                ? this.isBefore(localTo, units)
+                : !this.isAfter(localTo, units))
+        );
+    }
+
+    function isSame(input, units) {
+        var localInput = isMoment(input) ? input : createLocal(input),
+            inputMs;
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units) || 'millisecond';
+        if (units === 'millisecond') {
+            return this.valueOf() === localInput.valueOf();
+        } else {
+            inputMs = localInput.valueOf();
+            return (
+                this.clone().startOf(units).valueOf() <= inputMs &&
+                inputMs <= this.clone().endOf(units).valueOf()
+            );
+        }
+    }
+
+    function isSameOrAfter(input, units) {
+        return this.isSame(input, units) || this.isAfter(input, units);
+    }
+
+    function isSameOrBefore(input, units) {
+        return this.isSame(input, units) || this.isBefore(input, units);
+    }
+
+    function diff(input, units, asFloat) {
+        var that, zoneDelta, output;
+
+        if (!this.isValid()) {
+            return NaN;
+        }
+
+        that = cloneWithOffset(input, this);
+
+        if (!that.isValid()) {
+            return NaN;
+        }
+
+        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
+
+        units = normalizeUnits(units);
+
+        switch (units) {
+            case 'year':
+                output = monthDiff(this, that) / 12;
+                break;
+            case 'month':
+                output = monthDiff(this, that);
+                break;
+            case 'quarter':
+                output = monthDiff(this, that) / 3;
+                break;
+            case 'second':
+                output = (this - that) / 1e3;
+                break; // 1000
+            case 'minute':
+                output = (this - that) / 6e4;
+                break; // 1000 * 60
+            case 'hour':
+                output = (this - that) / 36e5;
+                break; // 1000 * 60 * 60
+            case 'day':
+                output = (this - that - zoneDelta) / 864e5;
+                break; // 1000 * 60 * 60 * 24, negate dst
+            case 'week':
+                output = (this - that - zoneDelta) / 6048e5;
+                break; // 1000 * 60 * 60 * 24 * 7, negate dst
+            default:
+                output = this - that;
+        }
+
+        return asFloat ? output : absFloor(output);
+    }
+
+    function monthDiff(a, b) {
+        if (a.date() < b.date()) {
+            // end-of-month calculations work correct when the start month has more
+            // days than the end month.
+            return -monthDiff(b, a);
+        }
+        // difference in months
+        var wholeMonthDiff = (b.year() - a.year()) * 12 + (b.month() - a.month()),
+            // b is in (anchor - 1 month, anchor + 1 month)
+            anchor = a.clone().add(wholeMonthDiff, 'months'),
+            anchor2,
+            adjust;
+
+        if (b - anchor < 0) {
+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor - anchor2);
+        } else {
+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor2 - anchor);
+        }
+
+        //check for negative zero, return zero if negative zero
+        return -(wholeMonthDiff + adjust) || 0;
+    }
+
+    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
+
+    function toString() {
+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+    }
+
+    function toISOString(keepOffset) {
+        if (!this.isValid()) {
+            return null;
+        }
+        var utc = keepOffset !== true,
+            m = utc ? this.clone().utc() : this;
+        if (m.year() < 0 || m.year() > 9999) {
+            return formatMoment(
+                m,
+                utc
+                    ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]'
+                    : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ'
+            );
+        }
+        if (isFunction(Date.prototype.toISOString)) {
+            // native implementation is ~50x faster, use it when we can
+            if (utc) {
+                return this.toDate().toISOString();
+            } else {
+                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000)
+                    .toISOString()
+                    .replace('Z', formatMoment(m, 'Z'));
+            }
+        }
+        return formatMoment(
+            m,
+            utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ'
+        );
+    }
+
+    /**
+     * Return a human readable representation of a moment that can
+     * also be evaluated to get a new moment which is the same
+     *
+     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
+     */
+    function inspect() {
+        if (!this.isValid()) {
+            return 'moment.invalid(/* ' + this._i + ' */)';
+        }
+        var func = 'moment',
+            zone = '',
+            prefix,
+            year,
+            datetime,
+            suffix;
+        if (!this.isLocal()) {
+            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
+            zone = 'Z';
+        }
+        prefix = '[' + func + '("]';
+        year = 0 <= this.year() && this.year() <= 9999 ? 'YYYY' : 'YYYYYY';
+        datetime = '-MM-DD[T]HH:mm:ss.SSS';
+        suffix = zone + '[")]';
+
+        return this.format(prefix + year + datetime + suffix);
+    }
+
+    function format(inputString) {
+        if (!inputString) {
+            inputString = this.isUtc()
+                ? hooks.defaultFormatUtc
+                : hooks.defaultFormat;
+        }
+        var output = formatMoment(this, inputString);
+        return this.localeData().postformat(output);
+    }
+
+    function from(time, withoutSuffix) {
+        if (
+            this.isValid() &&
+            ((isMoment(time) && time.isValid()) || createLocal(time).isValid())
+        ) {
+            return createDuration({ to: this, from: time })
+                .locale(this.locale())
+                .humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
+
+    function fromNow(withoutSuffix) {
+        return this.from(createLocal(), withoutSuffix);
+    }
+
+    function to(time, withoutSuffix) {
+        if (
+            this.isValid() &&
+            ((isMoment(time) && time.isValid()) || createLocal(time).isValid())
+        ) {
+            return createDuration({ from: this, to: time })
+                .locale(this.locale())
+                .humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
+
+    function toNow(withoutSuffix) {
+        return this.to(createLocal(), withoutSuffix);
+    }
+
+    // If passed a locale key, it will set the locale for this
+    // instance.  Otherwise, it will return the locale configuration
+    // variables for this instance.
+    function locale(key) {
+        var newLocaleData;
+
+        if (key === undefined) {
+            return this._locale._abbr;
+        } else {
+            newLocaleData = getLocale(key);
+            if (newLocaleData != null) {
+                this._locale = newLocaleData;
+            }
+            return this;
+        }
+    }
+
+    var lang = deprecate(
+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+        function (key) {
+            if (key === undefined) {
+                return this.localeData();
+            } else {
+                return this.locale(key);
+            }
+        }
+    );
+
+    function localeData() {
+        return this._locale;
+    }
+
+    var MS_PER_SECOND = 1000,
+        MS_PER_MINUTE = 60 * MS_PER_SECOND,
+        MS_PER_HOUR = 60 * MS_PER_MINUTE,
+        MS_PER_400_YEARS = (365 * 400 + 97) * 24 * MS_PER_HOUR;
+
+    // actual modulo - handles negative numbers (for dates before 1970):
+    function mod$1(dividend, divisor) {
+        return ((dividend % divisor) + divisor) % divisor;
+    }
+
+    function localStartOfDate(y, m, d) {
+        // the date constructor remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            // preserve leap years using a full 400 year cycle, then reset
+            return new Date(y + 400, m, d) - MS_PER_400_YEARS;
+        } else {
+            return new Date(y, m, d).valueOf();
+        }
+    }
+
+    function utcStartOfDate(y, m, d) {
+        // Date.UTC remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0) {
+            // preserve leap years using a full 400 year cycle, then reset
+            return Date.UTC(y + 400, m, d) - MS_PER_400_YEARS;
+        } else {
+            return Date.UTC(y, m, d);
+        }
+    }
+
+    function startOf(units) {
+        var time, startOfDate;
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond' || !this.isValid()) {
+            return this;
+        }
+
+        startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
+
+        switch (units) {
+            case 'year':
+                time = startOfDate(this.year(), 0, 1);
+                break;
+            case 'quarter':
+                time = startOfDate(
+                    this.year(),
+                    this.month() - (this.month() % 3),
+                    1
+                );
+                break;
+            case 'month':
+                time = startOfDate(this.year(), this.month(), 1);
+                break;
+            case 'week':
+                time = startOfDate(
+                    this.year(),
+                    this.month(),
+                    this.date() - this.weekday()
+                );
+                break;
+            case 'isoWeek':
+                time = startOfDate(
+                    this.year(),
+                    this.month(),
+                    this.date() - (this.isoWeekday() - 1)
+                );
+                break;
+            case 'day':
+            case 'date':
+                time = startOfDate(this.year(), this.month(), this.date());
+                break;
+            case 'hour':
+                time = this._d.valueOf();
+                time -= mod$1(
+                    time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE),
+                    MS_PER_HOUR
+                );
+                break;
+            case 'minute':
+                time = this._d.valueOf();
+                time -= mod$1(time, MS_PER_MINUTE);
+                break;
+            case 'second':
+                time = this._d.valueOf();
+                time -= mod$1(time, MS_PER_SECOND);
+                break;
+        }
+
+        this._d.setTime(time);
+        hooks.updateOffset(this, true);
+        return this;
+    }
+
+    function endOf(units) {
+        var time, startOfDate;
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond' || !this.isValid()) {
+            return this;
+        }
+
+        startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
+
+        switch (units) {
+            case 'year':
+                time = startOfDate(this.year() + 1, 0, 1) - 1;
+                break;
+            case 'quarter':
+                time =
+                    startOfDate(
+                        this.year(),
+                        this.month() - (this.month() % 3) + 3,
+                        1
+                    ) - 1;
+                break;
+            case 'month':
+                time = startOfDate(this.year(), this.month() + 1, 1) - 1;
+                break;
+            case 'week':
+                time =
+                    startOfDate(
+                        this.year(),
+                        this.month(),
+                        this.date() - this.weekday() + 7
+                    ) - 1;
+                break;
+            case 'isoWeek':
+                time =
+                    startOfDate(
+                        this.year(),
+                        this.month(),
+                        this.date() - (this.isoWeekday() - 1) + 7
+                    ) - 1;
+                break;
+            case 'day':
+            case 'date':
+                time = startOfDate(this.year(), this.month(), this.date() + 1) - 1;
+                break;
+            case 'hour':
+                time = this._d.valueOf();
+                time +=
+                    MS_PER_HOUR -
+                    mod$1(
+                        time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE),
+                        MS_PER_HOUR
+                    ) -
+                    1;
+                break;
+            case 'minute':
+                time = this._d.valueOf();
+                time += MS_PER_MINUTE - mod$1(time, MS_PER_MINUTE) - 1;
+                break;
+            case 'second':
+                time = this._d.valueOf();
+                time += MS_PER_SECOND - mod$1(time, MS_PER_SECOND) - 1;
+                break;
+        }
+
+        this._d.setTime(time);
+        hooks.updateOffset(this, true);
+        return this;
+    }
+
+    function valueOf() {
+        return this._d.valueOf() - (this._offset || 0) * 60000;
+    }
+
+    function unix() {
+        return Math.floor(this.valueOf() / 1000);
+    }
+
+    function toDate() {
+        return new Date(this.valueOf());
+    }
+
+    function toArray() {
+        var m = this;
+        return [
+            m.year(),
+            m.month(),
+            m.date(),
+            m.hour(),
+            m.minute(),
+            m.second(),
+            m.millisecond(),
+        ];
+    }
+
+    function toObject() {
+        var m = this;
+        return {
+            years: m.year(),
+            months: m.month(),
+            date: m.date(),
+            hours: m.hours(),
+            minutes: m.minutes(),
+            seconds: m.seconds(),
+            milliseconds: m.milliseconds(),
+        };
+    }
+
+    function toJSON() {
+        // new Date(NaN).toJSON() === null
+        return this.isValid() ? this.toISOString() : null;
+    }
+
+    function isValid$2() {
+        return isValid(this);
+    }
+
+    function parsingFlags() {
+        return extend({}, getParsingFlags(this));
+    }
+
+    function invalidAt() {
+        return getParsingFlags(this).overflow;
+    }
+
+    function creationData() {
+        return {
+            input: this._i,
+            format: this._f,
+            locale: this._locale,
+            isUTC: this._isUTC,
+            strict: this._strict,
+        };
+    }
+
+    addFormatToken('N', 0, 0, 'eraAbbr');
+    addFormatToken('NN', 0, 0, 'eraAbbr');
+    addFormatToken('NNN', 0, 0, 'eraAbbr');
+    addFormatToken('NNNN', 0, 0, 'eraName');
+    addFormatToken('NNNNN', 0, 0, 'eraNarrow');
+
+    addFormatToken('y', ['y', 1], 'yo', 'eraYear');
+    addFormatToken('y', ['yy', 2], 0, 'eraYear');
+    addFormatToken('y', ['yyy', 3], 0, 'eraYear');
+    addFormatToken('y', ['yyyy', 4], 0, 'eraYear');
+
+    addRegexToken('N', matchEraAbbr);
+    addRegexToken('NN', matchEraAbbr);
+    addRegexToken('NNN', matchEraAbbr);
+    addRegexToken('NNNN', matchEraName);
+    addRegexToken('NNNNN', matchEraNarrow);
+
+    addParseToken(
+        ['N', 'NN', 'NNN', 'NNNN', 'NNNNN'],
+        function (input, array, config, token) {
+            var era = config._locale.erasParse(input, token, config._strict);
+            if (era) {
+                getParsingFlags(config).era = era;
+            } else {
+                getParsingFlags(config).invalidEra = input;
+            }
+        }
+    );
+
+    addRegexToken('y', matchUnsigned);
+    addRegexToken('yy', matchUnsigned);
+    addRegexToken('yyy', matchUnsigned);
+    addRegexToken('yyyy', matchUnsigned);
+    addRegexToken('yo', matchEraYearOrdinal);
+
+    addParseToken(['y', 'yy', 'yyy', 'yyyy'], YEAR);
+    addParseToken(['yo'], function (input, array, config, token) {
+        var match;
+        if (config._locale._eraYearOrdinalRegex) {
+            match = input.match(config._locale._eraYearOrdinalRegex);
+        }
+
+        if (config._locale.eraYearOrdinalParse) {
+            array[YEAR] = config._locale.eraYearOrdinalParse(input, match);
+        } else {
+            array[YEAR] = parseInt(input, 10);
+        }
+    });
+
+    function localeEras(m, format) {
+        var i,
+            l,
+            date,
+            eras = this._eras || getLocale('en')._eras;
+        for (i = 0, l = eras.length; i < l; ++i) {
+            switch (typeof eras[i].since) {
+                case 'string':
+                    // truncate time
+                    date = hooks(eras[i].since).startOf('day');
+                    eras[i].since = date.valueOf();
+                    break;
+            }
+
+            switch (typeof eras[i].until) {
+                case 'undefined':
+                    eras[i].until = +Infinity;
+                    break;
+                case 'string':
+                    // truncate time
+                    date = hooks(eras[i].until).startOf('day').valueOf();
+                    eras[i].until = date.valueOf();
+                    break;
+            }
+        }
+        return eras;
+    }
+
+    function localeErasParse(eraName, format, strict) {
+        var i,
+            l,
+            eras = this.eras(),
+            name,
+            abbr,
+            narrow;
+        eraName = eraName.toUpperCase();
+
+        for (i = 0, l = eras.length; i < l; ++i) {
+            name = eras[i].name.toUpperCase();
+            abbr = eras[i].abbr.toUpperCase();
+            narrow = eras[i].narrow.toUpperCase();
+
+            if (strict) {
+                switch (format) {
+                    case 'N':
+                    case 'NN':
+                    case 'NNN':
+                        if (abbr === eraName) {
+                            return eras[i];
+                        }
+                        break;
+
+                    case 'NNNN':
+                        if (name === eraName) {
+                            return eras[i];
+                        }
+                        break;
+
+                    case 'NNNNN':
+                        if (narrow === eraName) {
+                            return eras[i];
+                        }
+                        break;
+                }
+            } else if ([name, abbr, narrow].indexOf(eraName) >= 0) {
+                return eras[i];
+            }
+        }
+    }
+
+    function localeErasConvertYear(era, year) {
+        var dir = era.since <= era.until ? +1 : -1;
+        if (year === undefined) {
+            return hooks(era.since).year();
+        } else {
+            return hooks(era.since).year() + (year - era.offset) * dir;
+        }
+    }
+
+    function getEraName() {
+        var i,
+            l,
+            val,
+            eras = this.localeData().eras();
+        for (i = 0, l = eras.length; i < l; ++i) {
+            // truncate time
+            val = this.clone().startOf('day').valueOf();
+
+            if (eras[i].since <= val && val <= eras[i].until) {
+                return eras[i].name;
+            }
+            if (eras[i].until <= val && val <= eras[i].since) {
+                return eras[i].name;
+            }
+        }
+
+        return '';
+    }
+
+    function getEraNarrow() {
+        var i,
+            l,
+            val,
+            eras = this.localeData().eras();
+        for (i = 0, l = eras.length; i < l; ++i) {
+            // truncate time
+            val = this.clone().startOf('day').valueOf();
+
+            if (eras[i].since <= val && val <= eras[i].until) {
+                return eras[i].narrow;
+            }
+            if (eras[i].until <= val && val <= eras[i].since) {
+                return eras[i].narrow;
+            }
+        }
+
+        return '';
+    }
+
+    function getEraAbbr() {
+        var i,
+            l,
+            val,
+            eras = this.localeData().eras();
+        for (i = 0, l = eras.length; i < l; ++i) {
+            // truncate time
+            val = this.clone().startOf('day').valueOf();
+
+            if (eras[i].since <= val && val <= eras[i].until) {
+                return eras[i].abbr;
+            }
+            if (eras[i].until <= val && val <= eras[i].since) {
+                return eras[i].abbr;
+            }
+        }
+
+        return '';
+    }
+
+    function getEraYear() {
+        var i,
+            l,
+            dir,
+            val,
+            eras = this.localeData().eras();
+        for (i = 0, l = eras.length; i < l; ++i) {
+            dir = eras[i].since <= eras[i].until ? +1 : -1;
+
+            // truncate time
+            val = this.clone().startOf('day').valueOf();
+
+            if (
+                (eras[i].since <= val && val <= eras[i].until) ||
+                (eras[i].until <= val && val <= eras[i].since)
+            ) {
+                return (
+                    (this.year() - hooks(eras[i].since).year()) * dir +
+                    eras[i].offset
+                );
+            }
+        }
+
+        return this.year();
+    }
+
+    function erasNameRegex(isStrict) {
+        if (!hasOwnProp(this, '_erasNameRegex')) {
+            computeErasParse.call(this);
+        }
+        return isStrict ? this._erasNameRegex : this._erasRegex;
+    }
+
+    function erasAbbrRegex(isStrict) {
+        if (!hasOwnProp(this, '_erasAbbrRegex')) {
+            computeErasParse.call(this);
+        }
+        return isStrict ? this._erasAbbrRegex : this._erasRegex;
+    }
+
+    function erasNarrowRegex(isStrict) {
+        if (!hasOwnProp(this, '_erasNarrowRegex')) {
+            computeErasParse.call(this);
+        }
+        return isStrict ? this._erasNarrowRegex : this._erasRegex;
+    }
+
+    function matchEraAbbr(isStrict, locale) {
+        return locale.erasAbbrRegex(isStrict);
+    }
+
+    function matchEraName(isStrict, locale) {
+        return locale.erasNameRegex(isStrict);
+    }
+
+    function matchEraNarrow(isStrict, locale) {
+        return locale.erasNarrowRegex(isStrict);
+    }
+
+    function matchEraYearOrdinal(isStrict, locale) {
+        return locale._eraYearOrdinalRegex || matchUnsigned;
+    }
+
+    function computeErasParse() {
+        var abbrPieces = [],
+            namePieces = [],
+            narrowPieces = [],
+            mixedPieces = [],
+            i,
+            l,
+            erasName,
+            erasAbbr,
+            erasNarrow,
+            eras = this.eras();
+
+        for (i = 0, l = eras.length; i < l; ++i) {
+            erasName = regexEscape(eras[i].name);
+            erasAbbr = regexEscape(eras[i].abbr);
+            erasNarrow = regexEscape(eras[i].narrow);
+
+            namePieces.push(erasName);
+            abbrPieces.push(erasAbbr);
+            narrowPieces.push(erasNarrow);
+            mixedPieces.push(erasName);
+            mixedPieces.push(erasAbbr);
+            mixedPieces.push(erasNarrow);
+        }
+
+        this._erasRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._erasNameRegex = new RegExp('^(' + namePieces.join('|') + ')', 'i');
+        this._erasAbbrRegex = new RegExp('^(' + abbrPieces.join('|') + ')', 'i');
+        this._erasNarrowRegex = new RegExp(
+            '^(' + narrowPieces.join('|') + ')',
+            'i'
+        );
+    }
+
+    // FORMATTING
+
+    addFormatToken(0, ['gg', 2], 0, function () {
+        return this.weekYear() % 100;
+    });
+
+    addFormatToken(0, ['GG', 2], 0, function () {
+        return this.isoWeekYear() % 100;
+    });
+
+    function addWeekYearFormatToken(token, getter) {
+        addFormatToken(0, [token, token.length], 0, getter);
+    }
+
+    addWeekYearFormatToken('gggg', 'weekYear');
+    addWeekYearFormatToken('ggggg', 'weekYear');
+    addWeekYearFormatToken('GGGG', 'isoWeekYear');
+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+    // ALIASES
+
+    // PARSING
+
+    addRegexToken('G', matchSigned);
+    addRegexToken('g', matchSigned);
+    addRegexToken('GG', match1to2, match2);
+    addRegexToken('gg', match1to2, match2);
+    addRegexToken('GGGG', match1to4, match4);
+    addRegexToken('gggg', match1to4, match4);
+    addRegexToken('GGGGG', match1to6, match6);
+    addRegexToken('ggggg', match1to6, match6);
+
+    addWeekParseToken(
+        ['gggg', 'ggggg', 'GGGG', 'GGGGG'],
+        function (input, week, config, token) {
+            week[token.substr(0, 2)] = toInt(input);
+        }
+    );
+
+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+        week[token] = hooks.parseTwoDigitYear(input);
+    });
+
+    // MOMENTS
+
+    function getSetWeekYear(input) {
+        return getSetWeekYearHelper.call(
+            this,
+            input,
+            this.week(),
+            this.weekday() + this.localeData()._week.dow,
+            this.localeData()._week.dow,
+            this.localeData()._week.doy
+        );
+    }
+
+    function getSetISOWeekYear(input) {
+        return getSetWeekYearHelper.call(
+            this,
+            input,
+            this.isoWeek(),
+            this.isoWeekday(),
+            1,
+            4
+        );
+    }
+
+    function getISOWeeksInYear() {
+        return weeksInYear(this.year(), 1, 4);
+    }
+
+    function getISOWeeksInISOWeekYear() {
+        return weeksInYear(this.isoWeekYear(), 1, 4);
+    }
+
+    function getWeeksInYear() {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+    }
+
+    function getWeeksInWeekYear() {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.weekYear(), weekInfo.dow, weekInfo.doy);
+    }
+
+    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
+        var weeksTarget;
+        if (input == null) {
+            return weekOfYear(this, dow, doy).year;
+        } else {
+            weeksTarget = weeksInYear(input, dow, doy);
+            if (week > weeksTarget) {
+                week = weeksTarget;
+            }
+            return setWeekAll.call(this, input, week, weekday, dow, doy);
+        }
+    }
+
+    function setWeekAll(weekYear, week, weekday, dow, doy) {
+        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
+            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
+
+        this.year(date.getUTCFullYear());
+        this.month(date.getUTCMonth());
+        this.date(date.getUTCDate());
+        return this;
+    }
+
+    // FORMATTING
+
+    addFormatToken('Q', 0, 'Qo', 'quarter');
+
+    // PARSING
+
+    addRegexToken('Q', match1);
+    addParseToken('Q', function (input, array) {
+        array[MONTH] = (toInt(input) - 1) * 3;
+    });
+
+    // MOMENTS
+
+    function getSetQuarter(input) {
+        return input == null
+            ? Math.ceil((this.month() + 1) / 3)
+            : this.month((input - 1) * 3 + (this.month() % 3));
+    }
+
+    // FORMATTING
+
+    addFormatToken('D', ['DD', 2], 'Do', 'date');
+
+    // PARSING
+
+    addRegexToken('D', match1to2, match1to2NoLeadingZero);
+    addRegexToken('DD', match1to2, match2);
+    addRegexToken('Do', function (isStrict, locale) {
+        // TODO: Remove "ordinalParse" fallback in next major release.
+        return isStrict
+            ? locale._dayOfMonthOrdinalParse || locale._ordinalParse
+            : locale._dayOfMonthOrdinalParseLenient;
+    });
+
+    addParseToken(['D', 'DD'], DATE);
+    addParseToken('Do', function (input, array) {
+        array[DATE] = toInt(input.match(match1to2)[0]);
+    });
+
+    // MOMENTS
+
+    var getSetDayOfMonth = makeGetSet('Date', true);
+
+    // FORMATTING
+
+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+
+    // PARSING
+
+    addRegexToken('DDD', match1to3);
+    addRegexToken('DDDD', match3);
+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+        config._dayOfYear = toInt(input);
+    });
+
+    // HELPERS
+
+    // MOMENTS
+
+    function getSetDayOfYear(input) {
+        var dayOfYear =
+            Math.round(
+                (this.clone().startOf('day') - this.clone().startOf('year')) / 864e5
+            ) + 1;
+        return input == null ? dayOfYear : this.add(input - dayOfYear, 'd');
+    }
+
+    // FORMATTING
+
+    addFormatToken('m', ['mm', 2], 0, 'minute');
+
+    // PARSING
+
+    addRegexToken('m', match1to2, match1to2HasZero);
+    addRegexToken('mm', match1to2, match2);
+    addParseToken(['m', 'mm'], MINUTE);
+
+    // MOMENTS
+
+    var getSetMinute = makeGetSet('Minutes', false);
+
+    // FORMATTING
+
+    addFormatToken('s', ['ss', 2], 0, 'second');
+
+    // PARSING
+
+    addRegexToken('s', match1to2, match1to2HasZero);
+    addRegexToken('ss', match1to2, match2);
+    addParseToken(['s', 'ss'], SECOND);
+
+    // MOMENTS
+
+    var getSetSecond = makeGetSet('Seconds', false);
+
+    // FORMATTING
+
+    addFormatToken('S', 0, 0, function () {
+        return ~~(this.millisecond() / 100);
+    });
+
+    addFormatToken(0, ['SS', 2], 0, function () {
+        return ~~(this.millisecond() / 10);
+    });
+
+    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
+    addFormatToken(0, ['SSSS', 4], 0, function () {
+        return this.millisecond() * 10;
+    });
+    addFormatToken(0, ['SSSSS', 5], 0, function () {
+        return this.millisecond() * 100;
+    });
+    addFormatToken(0, ['SSSSSS', 6], 0, function () {
+        return this.millisecond() * 1000;
+    });
+    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
+        return this.millisecond() * 10000;
+    });
+    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
+        return this.millisecond() * 100000;
+    });
+    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
+        return this.millisecond() * 1000000;
+    });
+
+    // PARSING
+
+    addRegexToken('S', match1to3, match1);
+    addRegexToken('SS', match1to3, match2);
+    addRegexToken('SSS', match1to3, match3);
+
+    var token, getSetMillisecond;
+    for (token = 'SSSS'; token.length <= 9; token += 'S') {
+        addRegexToken(token, matchUnsigned);
+    }
+
+    function parseMs(input, array) {
+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
+    }
+
+    for (token = 'S'; token.length <= 9; token += 'S') {
+        addParseToken(token, parseMs);
+    }
+
+    getSetMillisecond = makeGetSet('Milliseconds', false);
+
+    // FORMATTING
+
+    addFormatToken('z', 0, 0, 'zoneAbbr');
+    addFormatToken('zz', 0, 0, 'zoneName');
+
+    // MOMENTS
+
+    function getZoneAbbr() {
+        return this._isUTC ? 'UTC' : '';
+    }
+
+    function getZoneName() {
+        return this._isUTC ? 'Coordinated Universal Time' : '';
+    }
+
+    var proto = Moment.prototype;
+
+    proto.add = add;
+    proto.calendar = calendar$1;
+    proto.clone = clone;
+    proto.diff = diff;
+    proto.endOf = endOf;
+    proto.format = format;
+    proto.from = from;
+    proto.fromNow = fromNow;
+    proto.to = to;
+    proto.toNow = toNow;
+    proto.get = stringGet;
+    proto.invalidAt = invalidAt;
+    proto.isAfter = isAfter;
+    proto.isBefore = isBefore;
+    proto.isBetween = isBetween;
+    proto.isSame = isSame;
+    proto.isSameOrAfter = isSameOrAfter;
+    proto.isSameOrBefore = isSameOrBefore;
+    proto.isValid = isValid$2;
+    proto.lang = lang;
+    proto.locale = locale;
+    proto.localeData = localeData;
+    proto.max = prototypeMax;
+    proto.min = prototypeMin;
+    proto.parsingFlags = parsingFlags;
+    proto.set = stringSet;
+    proto.startOf = startOf;
+    proto.subtract = subtract;
+    proto.toArray = toArray;
+    proto.toObject = toObject;
+    proto.toDate = toDate;
+    proto.toISOString = toISOString;
+    proto.inspect = inspect;
+    if (typeof Symbol !== 'undefined' && Symbol.for != null) {
+        proto[Symbol.for('nodejs.util.inspect.custom')] = function () {
+            return 'Moment<' + this.format() + '>';
+        };
+    }
+    proto.toJSON = toJSON;
+    proto.toString = toString;
+    proto.unix = unix;
+    proto.valueOf = valueOf;
+    proto.creationData = creationData;
+    proto.eraName = getEraName;
+    proto.eraNarrow = getEraNarrow;
+    proto.eraAbbr = getEraAbbr;
+    proto.eraYear = getEraYear;
+    proto.year = getSetYear;
+    proto.isLeapYear = getIsLeapYear;
+    proto.weekYear = getSetWeekYear;
+    proto.isoWeekYear = getSetISOWeekYear;
+    proto.quarter = proto.quarters = getSetQuarter;
+    proto.month = getSetMonth;
+    proto.daysInMonth = getDaysInMonth;
+    proto.week = proto.weeks = getSetWeek;
+    proto.isoWeek = proto.isoWeeks = getSetISOWeek;
+    proto.weeksInYear = getWeeksInYear;
+    proto.weeksInWeekYear = getWeeksInWeekYear;
+    proto.isoWeeksInYear = getISOWeeksInYear;
+    proto.isoWeeksInISOWeekYear = getISOWeeksInISOWeekYear;
+    proto.date = getSetDayOfMonth;
+    proto.day = proto.days = getSetDayOfWeek;
+    proto.weekday = getSetLocaleDayOfWeek;
+    proto.isoWeekday = getSetISODayOfWeek;
+    proto.dayOfYear = getSetDayOfYear;
+    proto.hour = proto.hours = getSetHour;
+    proto.minute = proto.minutes = getSetMinute;
+    proto.second = proto.seconds = getSetSecond;
+    proto.millisecond = proto.milliseconds = getSetMillisecond;
+    proto.utcOffset = getSetOffset;
+    proto.utc = setOffsetToUTC;
+    proto.local = setOffsetToLocal;
+    proto.parseZone = setOffsetToParsedOffset;
+    proto.hasAlignedHourOffset = hasAlignedHourOffset;
+    proto.isDST = isDaylightSavingTime;
+    proto.isLocal = isLocal;
+    proto.isUtcOffset = isUtcOffset;
+    proto.isUtc = isUtc;
+    proto.isUTC = isUtc;
+    proto.zoneAbbr = getZoneAbbr;
+    proto.zoneName = getZoneName;
+    proto.dates = deprecate(
+        'dates accessor is deprecated. Use date instead.',
+        getSetDayOfMonth
+    );
+    proto.months = deprecate(
+        'months accessor is deprecated. Use month instead',
+        getSetMonth
+    );
+    proto.years = deprecate(
+        'years accessor is deprecated. Use year instead',
+        getSetYear
+    );
+    proto.zone = deprecate(
+        'moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/',
+        getSetZone
+    );
+    proto.isDSTShifted = deprecate(
+        'isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information',
+        isDaylightSavingTimeShifted
+    );
+
+    function createUnix(input) {
+        return createLocal(input * 1000);
+    }
+
+    function createInZone() {
+        return createLocal.apply(null, arguments).parseZone();
+    }
+
+    function preParsePostFormat(string) {
+        return string;
+    }
+
+    var proto$1 = Locale.prototype;
+
+    proto$1.calendar = calendar;
+    proto$1.longDateFormat = longDateFormat;
+    proto$1.invalidDate = invalidDate;
+    proto$1.ordinal = ordinal;
+    proto$1.preparse = preParsePostFormat;
+    proto$1.postformat = preParsePostFormat;
+    proto$1.relativeTime = relativeTime;
+    proto$1.pastFuture = pastFuture;
+    proto$1.set = set;
+    proto$1.eras = localeEras;
+    proto$1.erasParse = localeErasParse;
+    proto$1.erasConvertYear = localeErasConvertYear;
+    proto$1.erasAbbrRegex = erasAbbrRegex;
+    proto$1.erasNameRegex = erasNameRegex;
+    proto$1.erasNarrowRegex = erasNarrowRegex;
+
+    proto$1.months = localeMonths;
+    proto$1.monthsShort = localeMonthsShort;
+    proto$1.monthsParse = localeMonthsParse;
+    proto$1.monthsRegex = monthsRegex;
+    proto$1.monthsShortRegex = monthsShortRegex;
+    proto$1.week = localeWeek;
+    proto$1.firstDayOfYear = localeFirstDayOfYear;
+    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
+
+    proto$1.weekdays = localeWeekdays;
+    proto$1.weekdaysMin = localeWeekdaysMin;
+    proto$1.weekdaysShort = localeWeekdaysShort;
+    proto$1.weekdaysParse = localeWeekdaysParse;
+
+    proto$1.weekdaysRegex = weekdaysRegex;
+    proto$1.weekdaysShortRegex = weekdaysShortRegex;
+    proto$1.weekdaysMinRegex = weekdaysMinRegex;
+
+    proto$1.isPM = localeIsPM;
+    proto$1.meridiem = localeMeridiem;
+
+    function get$1(format, index, field, setter) {
+        var locale = getLocale(),
+            utc = createUTC().set(setter, index);
+        return locale[field](utc, format);
+    }
+
+    function listMonthsImpl(format, index, field) {
+        if (isNumber(format)) {
+            index = format;
+            format = undefined;
+        }
+
+        format = format || '';
+
+        if (index != null) {
+            return get$1(format, index, field, 'month');
+        }
+
+        var i,
+            out = [];
+        for (i = 0; i < 12; i++) {
+            out[i] = get$1(format, i, field, 'month');
+        }
+        return out;
+    }
+
+    // ()
+    // (5)
+    // (fmt, 5)
+    // (fmt)
+    // (true)
+    // (true, 5)
+    // (true, fmt, 5)
+    // (true, fmt)
+    function listWeekdaysImpl(localeSorted, format, index, field) {
+        if (typeof localeSorted === 'boolean') {
+            if (isNumber(format)) {
+                index = format;
+                format = undefined;
+            }
+
+            format = format || '';
+        } else {
+            format = localeSorted;
+            index = format;
+            localeSorted = false;
+
+            if (isNumber(format)) {
+                index = format;
+                format = undefined;
+            }
+
+            format = format || '';
+        }
+
+        var locale = getLocale(),
+            shift = localeSorted ? locale._week.dow : 0,
+            i,
+            out = [];
+
+        if (index != null) {
+            return get$1(format, (index + shift) % 7, field, 'day');
+        }
+
+        for (i = 0; i < 7; i++) {
+            out[i] = get$1(format, (i + shift) % 7, field, 'day');
+        }
+        return out;
+    }
+
+    function listMonths(format, index) {
+        return listMonthsImpl(format, index, 'months');
+    }
+
+    function listMonthsShort(format, index) {
+        return listMonthsImpl(format, index, 'monthsShort');
+    }
+
+    function listWeekdays(localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
+    }
+
+    function listWeekdaysShort(localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
+    }
+
+    function listWeekdaysMin(localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
+    }
+
+    getSetGlobalLocale('en', {
+        eras: [
+            {
+                since: '0001-01-01',
+                until: +Infinity,
+                offset: 1,
+                name: 'Anno Domini',
+                narrow: 'AD',
+                abbr: 'AD',
+            },
+            {
+                since: '0000-12-31',
+                until: -Infinity,
+                offset: 1,
+                name: 'Before Christ',
+                narrow: 'BC',
+                abbr: 'BC',
+            },
+        ],
+        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal: function (number) {
+            var b = number % 10,
+                output =
+                    toInt((number % 100) / 10) === 1
+                        ? 'th'
+                        : b === 1
+                          ? 'st'
+                          : b === 2
+                            ? 'nd'
+                            : b === 3
+                              ? 'rd'
+                              : 'th';
+            return number + output;
+        },
+    });
+
+    // Side effect imports
+
+    hooks.lang = deprecate(
+        'moment.lang is deprecated. Use moment.locale instead.',
+        getSetGlobalLocale
+    );
+    hooks.langData = deprecate(
+        'moment.langData is deprecated. Use moment.localeData instead.',
+        getLocale
+    );
+
+    var mathAbs = Math.abs;
+
+    function abs() {
+        var data = this._data;
+
+        this._milliseconds = mathAbs(this._milliseconds);
+        this._days = mathAbs(this._days);
+        this._months = mathAbs(this._months);
+
+        data.milliseconds = mathAbs(data.milliseconds);
+        data.seconds = mathAbs(data.seconds);
+        data.minutes = mathAbs(data.minutes);
+        data.hours = mathAbs(data.hours);
+        data.months = mathAbs(data.months);
+        data.years = mathAbs(data.years);
+
+        return this;
+    }
+
+    function addSubtract$1(duration, input, value, direction) {
+        var other = createDuration(input, value);
+
+        duration._milliseconds += direction * other._milliseconds;
+        duration._days += direction * other._days;
+        duration._months += direction * other._months;
+
+        return duration._bubble();
+    }
+
+    // supports only 2.0-style add(1, 's') or add(duration)
+    function add$1(input, value) {
+        return addSubtract$1(this, input, value, 1);
+    }
+
+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
+    function subtract$1(input, value) {
+        return addSubtract$1(this, input, value, -1);
+    }
+
+    function absCeil(number) {
+        if (number < 0) {
+            return Math.floor(number);
+        } else {
+            return Math.ceil(number);
+        }
+    }
+
+    function bubble() {
+        var milliseconds = this._milliseconds,
+            days = this._days,
+            months = this._months,
+            data = this._data,
+            seconds,
+            minutes,
+            hours,
+            years,
+            monthsFromDays;
+
+        // if we have a mix of positive and negative values, bubble down first
+        // check: https://github.com/moment/moment/issues/2166
+        if (
+            !(
+                (milliseconds >= 0 && days >= 0 && months >= 0) ||
+                (milliseconds <= 0 && days <= 0 && months <= 0)
+            )
+        ) {
+            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
+            days = 0;
+            months = 0;
+        }
+
+        // The following code bubbles up values, see the tests for
+        // examples of what that means.
+        data.milliseconds = milliseconds % 1000;
+
+        seconds = absFloor(milliseconds / 1000);
+        data.seconds = seconds % 60;
+
+        minutes = absFloor(seconds / 60);
+        data.minutes = minutes % 60;
+
+        hours = absFloor(minutes / 60);
+        data.hours = hours % 24;
+
+        days += absFloor(hours / 24);
+
+        // convert days to months
+        monthsFromDays = absFloor(daysToMonths(days));
+        months += monthsFromDays;
+        days -= absCeil(monthsToDays(monthsFromDays));
+
+        // 12 months -> 1 year
+        years = absFloor(months / 12);
+        months %= 12;
+
+        data.days = days;
+        data.months = months;
+        data.years = years;
+
+        return this;
+    }
+
+    function daysToMonths(days) {
+        // 400 years have 146097 days (taking into account leap year rules)
+        // 400 years have 12 months === 4800
+        return (days * 4800) / 146097;
+    }
+
+    function monthsToDays(months) {
+        // the reverse of daysToMonths
+        return (months * 146097) / 4800;
+    }
+
+    function as(units) {
+        if (!this.isValid()) {
+            return NaN;
+        }
+        var days,
+            months,
+            milliseconds = this._milliseconds;
+
+        units = normalizeUnits(units);
+
+        if (units === 'month' || units === 'quarter' || units === 'year') {
+            days = this._days + milliseconds / 864e5;
+            months = this._months + daysToMonths(days);
+            switch (units) {
+                case 'month':
+                    return months;
+                case 'quarter':
+                    return months / 3;
+                case 'year':
+                    return months / 12;
+            }
+        } else {
+            // handle milliseconds separately because of floating point math errors (issue #1867)
+            days = this._days + Math.round(monthsToDays(this._months));
+            switch (units) {
+                case 'week':
+                    return days / 7 + milliseconds / 6048e5;
+                case 'day':
+                    return days + milliseconds / 864e5;
+                case 'hour':
+                    return days * 24 + milliseconds / 36e5;
+                case 'minute':
+                    return days * 1440 + milliseconds / 6e4;
+                case 'second':
+                    return days * 86400 + milliseconds / 1000;
+                // Math.floor prevents floating point math errors here
+                case 'millisecond':
+                    return Math.floor(days * 864e5) + milliseconds;
+                default:
+                    throw new Error('Unknown unit ' + units);
+            }
+        }
+    }
+
+    function makeAs(alias) {
+        return function () {
+            return this.as(alias);
+        };
+    }
+
+    var asMilliseconds = makeAs('ms'),
+        asSeconds = makeAs('s'),
+        asMinutes = makeAs('m'),
+        asHours = makeAs('h'),
+        asDays = makeAs('d'),
+        asWeeks = makeAs('w'),
+        asMonths = makeAs('M'),
+        asQuarters = makeAs('Q'),
+        asYears = makeAs('y'),
+        valueOf$1 = asMilliseconds;
+
+    function clone$1() {
+        return createDuration(this);
+    }
+
+    function get$2(units) {
+        units = normalizeUnits(units);
+        return this.isValid() ? this[units + 's']() : NaN;
+    }
+
+    function makeGetter(name) {
+        return function () {
+            return this.isValid() ? this._data[name] : NaN;
+        };
+    }
+
+    var milliseconds = makeGetter('milliseconds'),
+        seconds = makeGetter('seconds'),
+        minutes = makeGetter('minutes'),
+        hours = makeGetter('hours'),
+        days = makeGetter('days'),
+        months = makeGetter('months'),
+        years = makeGetter('years');
+
+    function weeks() {
+        return absFloor(this.days() / 7);
+    }
+
+    var round = Math.round,
+        thresholds = {
+            ss: 44, // a few seconds to seconds
+            s: 45, // seconds to minute
+            m: 45, // minutes to hour
+            h: 22, // hours to day
+            d: 26, // days to month/week
+            w: null, // weeks to month
+            M: 11, // months to year
+        };
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function relativeTime$1(posNegDuration, withoutSuffix, thresholds, locale) {
+        var duration = createDuration(posNegDuration).abs(),
+            seconds = round(duration.as('s')),
+            minutes = round(duration.as('m')),
+            hours = round(duration.as('h')),
+            days = round(duration.as('d')),
+            months = round(duration.as('M')),
+            weeks = round(duration.as('w')),
+            years = round(duration.as('y')),
+            a =
+                (seconds <= thresholds.ss && ['s', seconds]) ||
+                (seconds < thresholds.s && ['ss', seconds]) ||
+                (minutes <= 1 && ['m']) ||
+                (minutes < thresholds.m && ['mm', minutes]) ||
+                (hours <= 1 && ['h']) ||
+                (hours < thresholds.h && ['hh', hours]) ||
+                (days <= 1 && ['d']) ||
+                (days < thresholds.d && ['dd', days]);
+
+        if (thresholds.w != null) {
+            a =
+                a ||
+                (weeks <= 1 && ['w']) ||
+                (weeks < thresholds.w && ['ww', weeks]);
+        }
+        a = a ||
+            (months <= 1 && ['M']) ||
+            (months < thresholds.M && ['MM', months]) ||
+            (years <= 1 && ['y']) || ['yy', years];
+
+        a[2] = withoutSuffix;
+        a[3] = +posNegDuration > 0;
+        a[4] = locale;
+        return substituteTimeAgo.apply(null, a);
+    }
+
+    // This function allows you to set the rounding function for relative time strings
+    function getSetRelativeTimeRounding(roundingFunction) {
+        if (roundingFunction === undefined) {
+            return round;
+        }
+        if (typeof roundingFunction === 'function') {
+            round = roundingFunction;
+            return true;
+        }
+        return false;
+    }
+
+    // This function allows you to set a threshold for relative time strings
+    function getSetRelativeTimeThreshold(threshold, limit) {
+        if (thresholds[threshold] === undefined) {
+            return false;
+        }
+        if (limit === undefined) {
+            return thresholds[threshold];
+        }
+        thresholds[threshold] = limit;
+        if (threshold === 's') {
+            thresholds.ss = limit - 1;
+        }
+        return true;
+    }
+
+    function humanize(argWithSuffix, argThresholds) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+
+        var withSuffix = false,
+            th = thresholds,
+            locale,
+            output;
+
+        if (typeof argWithSuffix === 'object') {
+            argThresholds = argWithSuffix;
+            argWithSuffix = false;
+        }
+        if (typeof argWithSuffix === 'boolean') {
+            withSuffix = argWithSuffix;
+        }
+        if (typeof argThresholds === 'object') {
+            th = Object.assign({}, thresholds, argThresholds);
+            if (argThresholds.s != null && argThresholds.ss == null) {
+                th.ss = argThresholds.s - 1;
+            }
+        }
+
+        locale = this.localeData();
+        output = relativeTime$1(this, !withSuffix, th, locale);
+
+        if (withSuffix) {
+            output = locale.pastFuture(+this, output);
+        }
+
+        return locale.postformat(output);
+    }
+
+    var abs$1 = Math.abs;
+
+    function sign(x) {
+        return (x > 0) - (x < 0) || +x;
+    }
+
+    function toISOString$1() {
+        // for ISO strings we do not use the normal bubbling rules:
+        //  * milliseconds bubble up until they become hours
+        //  * days do not bubble at all
+        //  * months bubble up until they become years
+        // This is because there is no context-free conversion between hours and days
+        // (think of clock changes)
+        // and also not between days and months (28-31 days per month)
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+
+        var seconds = abs$1(this._milliseconds) / 1000,
+            days = abs$1(this._days),
+            months = abs$1(this._months),
+            minutes,
+            hours,
+            years,
+            s,
+            total = this.asSeconds(),
+            totalSign,
+            ymSign,
+            daysSign,
+            hmsSign;
+
+        if (!total) {
+            // this is the same as C#'s (Noda) and python (isodate)...
+            // but not other JS (goog.date)
+            return 'P0D';
+        }
+
+        // 3600 seconds -> 60 minutes -> 1 hour
+        minutes = absFloor(seconds / 60);
+        hours = absFloor(minutes / 60);
+        seconds %= 60;
+        minutes %= 60;
+
+        // 12 months -> 1 year
+        years = absFloor(months / 12);
+        months %= 12;
+
+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+        s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
+
+        totalSign = total < 0 ? '-' : '';
+        ymSign = sign(this._months) !== sign(total) ? '-' : '';
+        daysSign = sign(this._days) !== sign(total) ? '-' : '';
+        hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
+
+        return (
+            totalSign +
+            'P' +
+            (years ? ymSign + years + 'Y' : '') +
+            (months ? ymSign + months + 'M' : '') +
+            (days ? daysSign + days + 'D' : '') +
+            (hours || minutes || seconds ? 'T' : '') +
+            (hours ? hmsSign + hours + 'H' : '') +
+            (minutes ? hmsSign + minutes + 'M' : '') +
+            (seconds ? hmsSign + s + 'S' : '')
+        );
+    }
+
+    var proto$2 = Duration.prototype;
+
+    proto$2.isValid = isValid$1;
+    proto$2.abs = abs;
+    proto$2.add = add$1;
+    proto$2.subtract = subtract$1;
+    proto$2.as = as;
+    proto$2.asMilliseconds = asMilliseconds;
+    proto$2.asSeconds = asSeconds;
+    proto$2.asMinutes = asMinutes;
+    proto$2.asHours = asHours;
+    proto$2.asDays = asDays;
+    proto$2.asWeeks = asWeeks;
+    proto$2.asMonths = asMonths;
+    proto$2.asQuarters = asQuarters;
+    proto$2.asYears = asYears;
+    proto$2.valueOf = valueOf$1;
+    proto$2._bubble = bubble;
+    proto$2.clone = clone$1;
+    proto$2.get = get$2;
+    proto$2.milliseconds = milliseconds;
+    proto$2.seconds = seconds;
+    proto$2.minutes = minutes;
+    proto$2.hours = hours;
+    proto$2.days = days;
+    proto$2.weeks = weeks;
+    proto$2.months = months;
+    proto$2.years = years;
+    proto$2.humanize = humanize;
+    proto$2.toISOString = toISOString$1;
+    proto$2.toString = toISOString$1;
+    proto$2.toJSON = toISOString$1;
+    proto$2.locale = locale;
+    proto$2.localeData = localeData;
+
+    proto$2.toIsoString = deprecate(
+        'toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)',
+        toISOString$1
+    );
+    proto$2.lang = lang;
+
+    // FORMATTING
+
+    addFormatToken('X', 0, 0, 'unix');
+    addFormatToken('x', 0, 0, 'valueOf');
+
+    // PARSING
+
+    addRegexToken('x', matchSigned);
+    addRegexToken('X', matchTimestamp);
+    addParseToken('X', function (input, array, config) {
+        config._d = new Date(parseFloat(input) * 1000);
+    });
+    addParseToken('x', function (input, array, config) {
+        config._d = new Date(toInt(input));
+    });
+
+    //! moment.js
+
+    hooks.version = '2.30.1';
+
+    setHookCallback(createLocal);
+
+    hooks.fn = proto;
+    hooks.min = min;
+    hooks.max = max;
+    hooks.now = now;
+    hooks.utc = createUTC;
+    hooks.unix = createUnix;
+    hooks.months = listMonths;
+    hooks.isDate = isDate;
+    hooks.locale = getSetGlobalLocale;
+    hooks.invalid = createInvalid;
+    hooks.duration = createDuration;
+    hooks.isMoment = isMoment;
+    hooks.weekdays = listWeekdays;
+    hooks.parseZone = createInZone;
+    hooks.localeData = getLocale;
+    hooks.isDuration = isDuration;
+    hooks.monthsShort = listMonthsShort;
+    hooks.weekdaysMin = listWeekdaysMin;
+    hooks.defineLocale = defineLocale;
+    hooks.updateLocale = updateLocale;
+    hooks.locales = listLocales;
+    hooks.weekdaysShort = listWeekdaysShort;
+    hooks.normalizeUnits = normalizeUnits;
+    hooks.relativeTimeRounding = getSetRelativeTimeRounding;
+    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
+    hooks.calendarFormat = getCalendarFormat;
+    hooks.prototype = proto;
+
+    // currently HTML5 input type only supports 24-hour formats
+    hooks.HTML5_FMT = {
+        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm', // <input type="datetime-local" />
+        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss', // <input type="datetime-local" step="1" />
+        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS', // <input type="datetime-local" step="0.001" />
+        DATE: 'YYYY-MM-DD', // <input type="date" />
+        TIME: 'HH:mm', // <input type="time" />
+        TIME_SECONDS: 'HH:mm:ss', // <input type="time" step="1" />
+        TIME_MS: 'HH:mm:ss.SSS', // <input type="time" step="0.001" />
+        WEEK: 'GGGG-[W]WW', // <input type="week" />
+        MONTH: 'YYYY-MM', // <input type="month" />
+    };
+
+    return hooks;
+
+})));
\ No newline at end of file
diff --git a/templates/administration/display_appointment.html b/templates/administration/display_appointment.html
index 0071e007..363d95db 100644
--- a/templates/administration/display_appointment.html
+++ b/templates/administration/display_appointment.html
@@ -93,6 +93,5 @@
             integrity="sha512-JCQkxdym6GmQ+AFVioDUq8dWaWN6tbKRhRyHvYZPupQ6DxpXzkW106FXS1ORgo/m3gxtt5lHRMqSdm2OfPajtg=="
             crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-    <script src="{% static 'js/js-utils.js' %}"></script>
 
 {% endblock %}
diff --git a/templates/administration/email_change_verification_code.html b/templates/administration/email_change_verification_code.html
index d080e5a8..62de14d6 100644
--- a/templates/administration/email_change_verification_code.html
+++ b/templates/administration/email_change_verification_code.html
@@ -10,7 +10,7 @@
 {% block description %}
     {% trans 'Enter Verification Code' %}
 {% endblock %}
-{% block body %}
+{% block content %}
     <section class="content content-wrapper">
         <div class="main-container">
             <div class="body-container">
diff --git a/templates/administration/manage_service.html b/templates/administration/manage_service.html
index 187cc410..26755ce0 100644
--- a/templates/administration/manage_service.html
+++ b/templates/administration/manage_service.html
@@ -1,51 +1,139 @@
 {% extends BASE_TEMPLATE %}
+{% load crispy_forms_filters custom_filters%}
 {% load i18n %}
 {% load static %}
 
 {% block customCSS %}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/btn.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/service.css' %}"/>
+
 {% endblock %}
 
-{% block body %}
-    <section class="content content-wrapper">
-        <div class="service-form-wrapper">
-            <div class="service-form-content">
-                <h2>{{ page_title }}</h2>
-                <form method="post" enctype="multipart/form-data">
+{% block content %}
+    {% translate "Confirm Deletion" as modal_title %}
+                {% translate "Delete" as delete_btn_modal %}
+        <div class="row">
+            <div class="col-6">
+                <h3 class="mb-3">{{ page_title }}</h3>
+                <form class="form" method="post" enctype="multipart/form-data">
                     {% csrf_token %}
-                    {{ form.as_p }}
+
+        <!-- Name Field -->
+        <div class="form-floating mb-3">
+            {{ form.name|add_class:"form-control form-control-sm" }}
+            <label for="{{ form.name.id_for_label }}">{{ _("Name") }}</label>
+            {% if form.name.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.name.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Description Field -->
+        <div class="form-floating mb-3">
+            {{ form.description|add_class:"form-control form-control-sm" }}
+            <label for="{{ form.description.id_for_label }}">{{ _("Description") }}</label>
+            {% if form.description.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.description.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Duration Field -->
+        <div class="form-floating mb-3">
+            {{ form.duration|add_class:"form-control form-control-sm" }}
+            <label for="{{ form.duration.id_for_label }}">{{ _("Duration") }}</label>
+            {% if form.duration.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.duration.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Price Field -->
+        <div class="form-floating mb-3">
+            {{ form.price|add_class:"form-control form-control-sm" }}
+            <label for="{{ form.price.id_for_label }}">{{ _("Price") }}</label>
+            {% if form.price.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.price.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Down Payment Field -->
+        <div class="form-floating mb-3">
+            {{ form.down_payment|add_class:"form-control form-control-sm" }}
+            <label for="{{ form.down_payment.id_for_label }}">{{ _("Down Payment<")}}/label>
+            {% if form.down_payment.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.down_payment.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Image Field -->
+        <div class="mb-3">
+            <label for="{{ form.image.id_for_label }}" class="form-label">{{ _("Image") }}</label>
+            {{ form.image }}
+            {% if form.image.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.image.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Currency Field -->
+         <div class="form-floating mb-3">
+            <select name="currency" id="id_currency" class="form-select form-control-sm" >
+                <option value="SAR">{{ CURRENCY }}</option>
+            </select>
+            <label for="id_currency">{{ _("Currency") }}</label>
+            {% if form.currency.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.currency.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+        <!-- Background Color Field -->
+        <div class="form-floating mb-3">
+        <input type="color" value="#000000" id="{{ form.background_color.id_for_label }}" class="form-control form-control-sm" >
+            <label for="{{ form.background_color.id_for_label }}">{{ _("Background Color")}}</label>
+            {% if form.background_color.errors %}
+                <div class="alert alert-danger mt-2">
+                    {{ form.background_color.errors }}
+                </div>
+            {% endif %}
+        </div>
+
+
                     {% if btn_text %}
-                        <button type="submit" class="btn btn-primary">{{ btn_text }}</button>
+                        <button type="submit" class="btn btn-sm btn-phoenix-primary">{{ btn_text }}</button>
                     {% else %}
                         {% if request.user.is_superuser and service.id %}
+{% translate "Are you sure you want to delete this service?" as d_modal_message %}
                             <div class="service-btn-container">
                                 <a href="{% url 'appointment:update_service' service_id=service.id %}"
-                                   class="modify-btn button-color-blue service-btn">
+                                   class="btn btn-sm btn-phoenix-primary">
                                     <i class="fas fa-pen"></i>
                                 </a>
                                 <a href="javascript:void(0)"
                                    onclick="showModal('{{ modal_title }}', '{{ d_modal_message }}', '{{ delete_btn_modal }}', '{% url 'appointment:delete_service' service_id=service.id %}', null)"
-                                   class="modify-btn button-color-red service-btn">
+                                   class="btn btn-sm btn-phoenix-danger">
                                     <i class="fas fa-trash"></i>
                                 </a>
                             </div>
                         {% endif %}
                     {% endif %}
                 </form>
-                <div class="messages" style="margin: 20px 0">
-                    {% if messages %}
-                        {% for message in messages %}
-                            <div class="alert alert-dismissible {% if message.tags %}alert-{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}danger{% else %}{{ message.tags }}{% endif %}{% endif %}"
-                                 role="alert">{{ message }}</div>
-                        {% endfor %}
-                    {% endif %}
-                </div>
+
             </div>
         </div>
-    </section>
+    {% include 'modal/confirm_modal.html' %}
 {% endblock %}
 
 {% block customJS %}
+    <script src="{% static 'js/modal/show_modal.js' %}"></script>
+
     <script src="{% static 'js/js-utils.js' %}"></script>
 {% endblock %}
diff --git a/templates/administration/manage_staff_member.html b/templates/administration/manage_staff_member.html
index 4c7ce226..eaa4f6c9 100644
--- a/templates/administration/manage_staff_member.html
+++ b/templates/administration/manage_staff_member.html
@@ -7,8 +7,8 @@
 {% endblock %}
 
 {% block body %}
-    <section class="content content-wrapper">
-        <div class="staff-form-wrapper">
+    <section class="main-container">
+        <div class="container-fluid">
             <div class="staff-form-content">
                 <h3>{% trans 'Staff Appointment Information' %}</h3>
                 <form method="post">
diff --git a/templates/administration/manage_staff_personal_info.html b/templates/administration/manage_staff_personal_info.html
index a9c07358..2cdd7257 100644
--- a/templates/administration/manage_staff_personal_info.html
+++ b/templates/administration/manage_staff_personal_info.html
@@ -3,33 +3,33 @@
 {% load static %}
 
 {% block customCSS %}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/staff_member.css' %}"/>
 {% endblock %}
 
-{% block body %}
-    <section class="content content-wrapper">
-        <div class="staff-form-wrapper">
-            <div class="staff-form-content">
-                <h3>{% trans 'Staff Personal Information' %}</h3>
+{% block content %}
+    <div class="row">
+
+            <div class="col-6">
+                <h3 class="mb-3">{% trans 'Staff Personal Information' %}</h3>
                 <form id="updatePersonalInfoForm" method="post" action="">
                     {% csrf_token %}
 
-                    <div class="form-group">
-                        {{ form.first_name.label_tag }}
+                    <div class="form-floating mb-3">
                         {{ form.first_name }}
+                        <label for="first_name">{{ _("First Name") }}</label>
+
                     </div>
 
-                    <div class="form-group">
-                        {{ form.last_name.label_tag }}
+                    <div class="form-floating mb-3">
                         {{ form.last_name }}
+                        <label for="last_name">{{ _("Last Name") }}</label>
                     </div>
 
-                    <div class="form-group">
-                        {{ form.email.label_tag }}
+                    <div class="form-floating mb-3">
                         {{ form.email }}
+                        <label for="email">{{ _("Email") }}</label>
                     </div>
 
-                    <button type="submit" class="btn btn-primary">{{ btn_text }}</button>
+                    <button type="submit" class="btn btn-phoenix-primary">{{ btn_text }}</button>
                 </form>
                 <div class="messages" style="margin: 20px 0">
                     {% if messages %}
@@ -40,8 +40,7 @@
                     {% endif %}
                 </div>
             </div>
-        </div>
-    </section>
+    </div>
 {% endblock %}
 
 {% block customJS %}
diff --git a/templates/administration/manage_working_hours.html b/templates/administration/manage_working_hours.html
index 819f383d..671ecece 100644
--- a/templates/administration/manage_working_hours.html
+++ b/templates/administration/manage_working_hours.html
@@ -1,28 +1,19 @@
 {% extends BASE_TEMPLATE %}
 {% load i18n %}
 {% load static %}
+{% load custom_filters %}
 
 {% block customCSS %}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/working_hours.css' %}"/>
     <!-- additional CSS -->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
-          integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/css/bootstrap.min.css"
-          integrity="sha512-rt/SrQ4UNIaGfDyEXZtNcyWvQeOq0QLygHluFQcSjaGB04IxWhal71tKuzP6K8eYXYB6vJV4pHkXcmFGGQ1/0w=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
-    <link rel="stylesheet"
-          href="https://cdnjs.cloudflare.com/ajax/libs/tempusdominus-bootstrap-4/5.39.0/css/tempusdominus-bootstrap-4.min.css"
-          integrity="sha512-3JRrEUwaCkFUBLK1N8HehwQgu8e23jTH4np5NHOmQOobuC4ROQxFwFgBLTnhcnQRMs84muMh0PnnwXlPq5MGjg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+
 {% endblock %}
 
-{% block body %}
-    <section class="content content-wrapper">
-        <div class="working-hours-form-wrapper">
-            <div class="wh-form-content">
-                <h2>{% trans "Manage Working Hours" %}</h2>
-                <form method="post" action="" id="workingHoursForm"
+{% block content %}
+    <div class="row">
+        <div class="col-6">
+
+                <h3>{% trans "Manage Working Hours" %}</h3>
+                <form class="form" method="post" action="" id="workingHoursForm"
                       data-action="{% if working_hours_instance %}update{% else %}create{% endif %}"
                       data-working-hours-id="
                           {% if working_hours_instance %}{{ working_hours_instance.id }}{% else %}0{% endif %}"
@@ -30,45 +21,40 @@
                     {% csrf_token %}
 
                     {% if working_hours_form.staff_member %}
-                        <div class="form-group">
-                            <label for="{{ working_hours_form.staff_member.id_for_label }}">{% trans 'Staff Member' %}:</label>
+                        <div class="form-group mb-3">
+                            <label class="form-label" for="{{ working_hours_form.staff_member.id_for_label }}">{% trans 'Staff Member' %}:</label>
                             {{ working_hours_form.staff_member }}
                         </div>
                     {% endif %}
 
-                    <div class="form-group">
-                        <label for="{{ working_hours_form.day_of_week.id_for_label }}">{% trans 'Day of Week' %}:</label>
-                        {{ working_hours_form.day_of_week }}
+                    <div class="form-group mb-3">
+                        <label class="form-label" for="{{ working_hours_form.day_of_week.id_for_label }}">{% trans 'Day of Week' %}:</label>
+                        {{ working_hours_form.day_of_week|add_class:"form-select form-select-sm" }}
                     </div>
 
-                    <div class="form-group">
-                        <label for="{{ working_hours_form.start_time.id_for_label }}">{% trans 'Start time' %}:</label>
-                        <div class="input-group date" id="start-timepicker" data-target-input="nearest">
-                            <input type="text" class="form-control datetimepicker-input" data-toggle="datetimepicker"
+                    <div class="form-group mb-3">
+                        <label class="form-label" for="{{ working_hours_form.start_time.id_for_label }}">{% trans 'Start time' %}:</label>
+                        <div class="input-group time24hr" id="start-timepicker" data-target-input="nearest">
+                            <input type="text" class="form-control form-control-sm datetimepicker-input" data-toggle="datetimepicker"
                                    data-target="#start-timepicker" name="{{ working_hours_form.start_time.name }}"
                                    value="{{ working_hours_form.start_time.value|default:'09:00 AM' }}"
                                    id="{{ working_hours_form.start_time.id_for_label }}">
-                            <div class="input-group-append" data-toggle="datetimepicker"
-                                 data-target="#start-timepicker">
-                                <div class="input-group-text"><i class="far fa-clock"></i></div>
-                            </div>
+                                <div class="input-group-text" data-toggle="datetimepicker" data-target="#start-timepicker"><i class="far fa-clock"></i></div>
                         </div>
                     </div>
 
-                    <div class="form-group">
-                        <label for="{{ working_hours_form.end_time.id_for_label }}">{% trans 'End time' %}:</label>
+                    <div class="form-group mb-3">
+                        <label class="form-label" for="{{ working_hours_form.end_time.id_for_label }}">{% trans 'End time' %}:</label>
                         <div class="input-group date" id="end-timepicker" data-target-input="nearest">
-                            <input type="text" class="form-control datetimepicker-input" data-toggle="datetimepicker"
+                            <input type="text" class="form-control form-control-sm datetimepicker-input" data-toggle="datetimepicker"
                                    data-target="#end-timepicker" name="{{ working_hours_form.end_time.name }}"
                                    value="{{ working_hours_form.end_time.value|default:'05:00 PM' }}"
                                    id="{{ working_hours_form.end_time.id_for_label }}">
-                            <div class="input-group-append" data-toggle="datetimepicker" data-target="#end-timepicker">
-                                <div class="input-group-text"><i class="far fa-clock"></i></div>
-                            </div>
+                                <div class="input-group-text" data-toggle="datetimepicker" data-target="#end-timepicker"><i class="far fa-clock"></i></div>
                         </div>
                     </div>
 
-                    <button type="submit" class="btn btn-primary">{{ button_text }}</button>
+                    <button type="submit" class="btn btn-sm btn-phoenix-primary">{{ button_text }}</button>
                     <input type="hidden" id="addWorkingHoursUrl"
                            value="{% url 'appointment:add_working_hours_id' staff_user_id|default:user.id %}">
                     <input type="hidden" id="updateWorkingHoursUrl"
@@ -86,13 +72,10 @@
                 </div>
             </div>
         </div>
-    </section>
 {% endblock %}
 {% block customJS %}
     <!-- JS -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
-            integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js"
             integrity="sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
             crossorigin="anonymous" referrerpolicy="no-referrer"></script>
diff --git a/templates/administration/service_list.html b/templates/administration/service_list.html
index 4251649c..1fc7e713 100644
--- a/templates/administration/service_list.html
+++ b/templates/administration/service_list.html
@@ -9,43 +9,45 @@
     {% trans 'Service List' %}.
 {% endblock %}
 {% block body %}
-
-        <div class="pt-5 pb-9">
-            <section class="profile-section">
-                <div class="section-header">
+{% translate "Confirm Deletion" as modal_title %}
+                {% translate "Delete" as delete_btn_modal %}
+        <div class="row">
+                <div class="col-6">
                     <h2 class="section-header-itm">{% trans 'Service List' %}</h2>
                 </div>
-                <div class="responsive-table-container">
-                    <table>
+                <div class="table-responsive px-1">
+              <table class="table table-sm fs-9 mb-0">
                         <thead>
                         <tr>
-                            <th>{% trans 'Name' %}</th>
-                            <th>{% trans 'Duration' %}</th>
-                            <th>{% trans 'Price' %}</th>
-                            <th>{% trans 'Action' %}</th>
+                            <th class="fw-bold"></th>
+                            <th class="fw-bold">{% trans 'Name' %}</th>
+                            <th class="fw-bold">{% trans 'Duration' %}</th>
+                            <th class="fw-bold">{% trans 'Price' %}</th>
+                            <th class="fw-bold">{% trans 'Action' %}</th>
                         </tr>
                         </thead>
                         <tbody>
                         {% for service in services %}
                             <tr>
+                                <td><img class="rounded-soft" src="{{ service.get_image_url }}" alt="" style="width: 35px; height: 35px;"/></td>
                                 <td>{{ service.name }}</td>
                                 <td>{{ service.get_duration }}</td>
                                 <td>{{ service.get_price_text }}</td>
                                 <td>
-                                    <div class="buttons-container">
+                                    <div class="btn-group btn-group-sm">
                                         <a href="{% url 'appointment:view_service' service_id=service.id view=1 %}"
-                                           class="modify-btn button-color-green">
+                                           class="btn btn-sm btn-phoenix-success me-2">
                                             <i class="fas fa-eye"></i>
                                         </a>
                                         {% translate "Are you sure you want to delete this service?" as d_modal_message %}
                                         {% if request.user.is_superuser %}
                                             <a href="{% url 'appointment:update_service' service_id=service.id %}"
-                                               class="modify-btn button-color-blue">
+                                               class="btn btn-sm btn-phoenix-primary me-2">
                                                 <i class="fas fa-pen"></i>
                                             </a>
                                             <a href="javascript:void(0)"
                                                onclick="showModal('{{ modal_title }}', '{{ d_modal_message }}', '{{ delete_btn_modal }}', '{% url 'appointment:delete_service' service_id=service.id %}', null)"
-                                               class="modify-btn button-color-red">
+                                               class="btn btn-sm btn-phoenix-danger me-2">
                                                 <i class="fas fa-trash"></i>
                                             </a>
                                         {% endif %}
@@ -60,19 +62,13 @@
                         </tbody>
                     </table>
                 </div>
-            </section>
-            <div class="messages" style="margin: 20px 0">
-                {% if messages %}
-                    {% for message in messages %}
-                        <div class="alert alert-dismissible {% if message.tags %}alert-{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}danger{% else %}{{ message.tags }}{% endif %}{% endif %}"
-                             role="alert">{{ message }}</div>
-                    {% endfor %}
-                {% endif %}
-            </div>
+{% include 'modal/confirm_modal.html' %}
         </div>
 
 {% endblock %}
 
 {% block customJS %}
+    <script src="{% static 'js/modal/show_modal.js' %}"></script>
     <script src="{% static 'js/js-utils.js' %}"></script>
+
 {% endblock %}
diff --git a/templates/administration/staff_index.html b/templates/administration/staff_index.html
index e1683d2d..9ff00980 100644
--- a/templates/administration/staff_index.html
+++ b/templates/administration/staff_index.html
@@ -7,259 +7,13 @@
 {% block customCSS %}
     <link rel="stylesheet" type="text/css" href="{% static 'css/appt-common.css' %}"/>
     <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/admin.css' %}"/>
-    <style>
-        @media (max-width: 991px) {
-            body {
-                font-size: 15px; /* Adjust font size for tablets */
-            }
 
-            #calendar {
-                max-width: 800px; /* Adjust calendar width for tablets */
-            }
-        }
-
-        /* Mobile Styles */
-        @media (max-width: 767px) {
-            body {
-                margin: 20px 5px; /* Reduce margins on mobile */
-                font-size: 14px; /* Adjust font size for mobiles */
-            }
-
-            #calendar {
-                max-width: 100%; /* Let the calendar take the full width on mobile */
-            }
-
-            .fc, .fc-toolbar-title, h2 {
-                font-size: 15px !important; /* Adjust as needed */
-                margin: 0; /* Remove any default margin */
-            }
-        }
-
-        .calendar-wrapper {
-            display: flex;
-            transition: all 0.3s; /* smooth transition for resizing */
-            width: 100%;
-            flex-direction: column;
-            margin-top: 25px;
-        }
-
-        #calendar {
-            flex-grow: 1; /* Makes the calendar grow to occupy all available space */
-            transition: all 0.3s; /* smooth transition for resizing */
-            width: 100%;
-        }
-
-        #event-details {
-            overflow-y: auto;
-            width: 0; /* initially hidden */
-            transition: all 0.3s; /* smooth transition for resizing */
-            border-left: 1px solid #ccc;
-            flex-shrink: 0; /* Prevents the div from shrinking beyond its content's size */
-        }
-
-        .modal-content {
-            background-color: #fff;
-            margin: 10% auto; /* Centering the modal vertically */
-            width: 100%;
-            position: relative; /* For positioning the close button */
-            box-shadow: 0 0 20px rgba(0, 0, 0, 0.2); /* A little shadow for depth */
-        }
-
-        .modal-footer {
-            text-align: right;
-        }
-
-        .close-button {
-            position: absolute;
-            top: 10px;
-            right: 10px;
-            background: none;
-            border: none;
-            font-size: 24px;
-            cursor: pointer;
-        }
-
-        .body-blur {
-            filter: blur(2px); /* This will blur the whole body when modal is open */
-        }
-
-        #eventDetailsModal .modal-content {
-            background-color: #f4f4f4;
-            border-radius: 10px;
-        }
-
-        #eventDetailsModal .modal-header,
-        #eventDetailsModal .modal-footer {
-            background-color: #2c3e50;
-            color: #ecf0f1;
-        }
-
-        #eventDetailsModal .modal-title {
-            font-weight: bold;
-        }
-
-        #eventDetailsModal label {
-            display: block;
-            margin-top: 10px;
-        }
-
-        #eventDetailsModal input {
-            width: 100%;
-            padding: 5px;
-            margin: 5px 0;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-        }
-
-        #eventDetailsModal .btn {
-            margin-right: 10px;
-        }
-
-        #serviceSelect, #staffSelect {
-            width: 100%;
-            padding: 8px 12px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
-            background-color: #f9f9f9;
-            font-size: 14px;
-            transition: background-color 0.3s ease;
-        }
-
-        #serviceSelect:disabled, #staffSelect:disabled {
-            background-color: #e9ecef;
-        }
-
-        #customContextMenu ul {
-            list-style: none;
-            margin: 0;
-            padding: 0;
-        }
-
-        #customContextMenu ul li a {
-            padding: 5px 10px;
-            display: block;
-            text-decoration: none;
-            color: black;
-        }
-
-        #customContextMenu ul li a:hover {
-            background-color: #f0f0f0;
-        }
-
-        #customContextMenu {
-            border: 1px solid #ccc;
-            background-color: #fff;
-            box-shadow: 2px 2px 5px rgba(0, 0, 0, 0.2);
-            padding: 5px 0;
-            position: absolute;
-            z-index: 1000;
-            display: none;
-        }
-
-
-        #eventDetailsModal input[type="checkbox"] {
-            width: auto;
-            margin: 0 5px 0 0;
-        }
-
-        /* General styles */
-        .flex-container-appt {
-            display: flex;
-            align-items: center;
-            margin-top: 5px;
-        }
-
-        .flex-container-appt label {
-            flex: 0 0 auto; /* Do not grow, do not shrink, and base width on content */
-            margin-right: 5px;
-            white-space: nowrap; /* Prevent label from wrapping */
-        }
-
-        .flex-container-appt input,
-        .flex-container-appt select {
-            flex: 1 1 auto; /* Grow and shrink based on available space */
-        }
-
-        /* Larger Modal on Desktop */
-        @media (min-width: 850px) {
-            .modal-content {
-                /* centering the modal horizontally */
-                margin: 10% auto;
-                left: 0;
-                right: 0;
-            }
-        }
-
-        /* Stack label and input on mobile */
-        @media (max-width: 767px) {
-            .flex-container-appt {
-                flex-direction: column;
-                align-items: flex-start;
-            }
-
-            .flex-container-appt label {
-                margin-right: 0;
-                margin-bottom: 5px;
-            }
-        }
-
-        .highlight-weekend {
-            background-color: rgba(155, 155, 155, 0.03); /* Light gray background for weekends */
-        }
-
-        .event-dot {
-            height: 5px;
-            width: 5px;
-            border-radius: 50%;
-            display: inline-block;
-            margin: 2px;
-        }
-
-        /* Hide event list container on larger screens */
-        @media (min-width: 768px) {
-            #event-list-container {
-                display: none; /* Hide the event list container */
-            }
-        }
-
-        /* Show event list container on smaller screens */
-        @media (max-width: 767px) {
-            #event-list-container {
-                /* Styles to display and position the event list container */
-                display: block; /* Show the event list container */
-                margin-top: 20px; /* Space from the calendar */
-            }
-
-            .event-list-item {
-                /* Styles for individual event list items */
-                padding: 10px;
-                border-bottom: 1px solid #ccc;
-            }
-        }
-
-        @media (max-width: 450px) {
-            .fc-daygrid-event-harness {
-                width: 5px;
-            }
-
-            .fc td, .fc th {
-
-            }
-        }
-
-        .event-list-item-appt {
-            /* pointer hand cursor */
-            cursor: pointer;
-        }
-    </style>
 {% endblock %}
 {% block title %}
     {{ page_title }}
 {% endblock %}
-{% block description %}
-    {{ page_description }}
-{% endblock %}
-{% block body %}
+
+{% block content %}
     <section class="content content-wrapper">
         <div class="container">
             <div class="calendar-wrapper">
@@ -282,7 +36,7 @@
     </section>
     <div id="customContextMenu" style="display: none; position: absolute; z-index: 1000;">
         <ul>
-            <li id="newAppointmentOption"><a href="#">New Appointment</a></li>
+            <li id="newAppointmentOption"><a href="#">{{ _("New Appointment")}}</a></li>
         </ul>
     </div>
 
diff --git a/templates/administration/staff_list.html b/templates/administration/staff_list.html
index 70fb7142..53db1c81 100644
--- a/templates/administration/staff_list.html
+++ b/templates/administration/staff_list.html
@@ -2,37 +2,33 @@
 {% load i18n %}
 {% load static %}
 {% block customCSS %}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/btn.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/user_profile.css' %}"/>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
-          integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+
 {% endblock %}
 {% block title %}
-    Staff Members List
+{{ _("Staff Members List")}}
 {% endblock %}
 {% block description %}
     {% trans 'List of all staff members' %}.
 {% endblock %}
 {% block body %}
 
-        <div class="profile-container">
-            <section class="profile-section">
-                <div class="section-header">
-                    <h2 class="section-header-itm">{% trans 'Staff Members' %}</h2>
+
+            <div class="row">
+                <div class="col-6">
+                    <h3 class="section-header-itm">{% trans 'Staff Members' %}</h3>
                     <div class="buttons-container section-header-itm">
                         <a href="{{ btn_staff_me_link }}"
-                           class="modify-btn button-color-purple">
+                           class="btn btn-sm btn-phoenix-info">
                             {{ btn_staff_me }}
                         </a>
                         <a href="{% url 'appointment:add_staff_member_info' %}"
-                           class="modify-btn button-color-green">
+                           class="btn btn-sm btn-phoenix-success">{{ _("Add") }}
                             <i class="fas fa-add"></i>
                         </a>
                     </div>
                 </div>
-                <div class="responsive-table-container">
-                    <table>
+                <div class="table-responsive">
+              <table class="table table-sm fs-9 mb-0">
                         <thead>
                         <tr>
                             <th>{% trans 'Name' %}</th>
@@ -47,9 +43,9 @@
                                 <td>{{ staff_member.user.email|default:"N/A" }}</td>
                                 <td>
                                     <a href="{% url 'appointment:user_profile' staff_member.user.id %}"
-                                       class="modify-btn button-color-blue">{% trans 'View Profile' %}</a>
+                                       class="btn btn-sm btn-phoenix-primary">{% trans 'View Profile' %}</a>
                                     <a href="{% url 'appointment:remove_staff_member' staff_member.user.id %}"
-                                       class="modify-btn button-color-red">{% trans 'Remove' %}</a>
+                                       class="btn btn-sm btn-phoenix-danger">{% trans 'Remove' %}</a>
                                 </td>
                             </tr>
                         {% empty %}
@@ -63,16 +59,7 @@
                         </tbody>
                     </table>
                 </div>
-            </section>
-            <div class="messages" style="margin: 20px 0">
-                {% if messages %}
-                    {% for message in messages %}
-                        <div class="alert alert-dismissible {% if message.tags %}alert-{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}danger{% else %}{{ message.tags }}{% endif %}{% endif %}"
-                             role="alert">{{ message }}</div>
-                    {% endfor %}
-                {% endif %}
             </div>
-        </div>
 
 {% endblock %}
 
diff --git a/templates/administration/user_profile.html b/templates/administration/user_profile.html
index c762c671..f7f2dbc4 100644
--- a/templates/administration/user_profile.html
+++ b/templates/administration/user_profile.html
@@ -2,14 +2,7 @@
 {% load i18n %}
 {% load static %}
 {% block customCSS %}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/btn.css' %}"/>
-    <link rel="stylesheet" type="text/css" href="{% static 'css/app_admin/user_profile.css' %}"/>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
-          integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.2/css/bootstrap.min.css"
-          integrity="sha512-b2QcS5SsA8tZodcDtGRELiGv5SaKSk1vDHDaQRda0htPYWZ6046lr3kJ5bAAQdpV2mmA/4v0wQF9MyU6/pDIAg=="
-          crossorigin="anonymous" referrerpolicy="no-referrer"/>
+
 {% endblock %}
 {% block title %}
     {{ page_title }}
@@ -17,37 +10,31 @@
 {% block description %}
     {{ page_description }}
 {% endblock %}
-{% block body %}
-    <section class="content content-wrapper">
-        <div class="profile-container">
-            <div class="messages" style="padding: 20px 0">
-                {% if messages %}
-                    {% for message in messages %}
-                        <div class="alert alert-dismissible {% if message.tags %}alert-{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}danger{% else %}{{ message.tags }}{% endif %}{% endif %}"
-                             role="alert">{{ message }}</div>
-                    {% endfor %}
-                {% endif %}
-            </div>
-            <section class="profile-section">
+{% block content %}
+
+            <div class="row mt-4">
+                <div class="col-6">
                 {% translate "Confirm Deletion" as modal_title %}
                 {% translate "Delete" as delete_btn_modal %}
 
-                <h2>{% trans 'Personal Information' %}</h2>
+                <h3>{% trans 'Personal Information' %}</h3>
                 <!-- Display fields from PersonalInformationForm -->
                 <div class="section-content">
-                    <p><strong>{% trans 'First name' %}:</strong> {{ user.first_name|default:user.username }}</p>
-                    <p><strong>{% trans 'Last name' %}:</strong> {{ user.last_name|default:"N/A" }}</p>
-                    <p><strong>{% trans 'Email' %}:</strong> {{ user.email|default:"N/A" }}</p>
+                    <p><strong>{% trans 'First name' %}:</strong> {{ user.first_name }}</p>
+                    <p><strong>{% trans 'Last name' %}:</strong> {{ user.last_name }}</p>
+                    <p><strong>{% trans 'Email' %}:</strong> {{ user.email }}</p>
                 </div>
                 <a href="{% url 'appointment:update_user_info' user.id %}"
-                   class="section-content-button modify-btn button-color-blue">
+                   class="btn btn-sm btn-phoenix-primary">
                     <i class="fas fa-pen"></i>
                 </a>
-            </section>
+                </div>
+            </div>
 
             <!-- Appointment Information Section -->
-            <section class="profile-section">
-                <h2>{% trans 'Appointment Information' %}</h2>
+            <div class="row mt-4">
+            <div class="col-6">
+                <h3>{% trans 'Appointment Information' %}</h3>
                 <small>
                     {{ service_msg }}
                 </small>
@@ -71,7 +58,7 @@
 
                     </div>
                     <a href="{% url 'appointment:update_staff_other_info' staff_member.user.id %}"
-                       class="section-content-button modify-btn button-color-blue">
+                       class="btn btn-sm section-content-button modify-btn button-color-blue btn-phoenix-primary">
                         <i class="fas fa-pen"></i>
                     </a>
                 {% else %}
@@ -79,25 +66,26 @@
                         <p>{% trans 'No staff member information yet for this user' %}.</p>
                     </div>
                     <a href="{% url 'appointment:update_staff_other_info' user.id %}"
-                       class="section-content-button modify-btn button-color-green">
+                       class="btn btn-sm section-content-button modify-btn button-color-green btn-phoenix-success">
                         <i class="fas fa-add"></i>
                     </a>
                 {% endif %}
-
-            </section>
+            </div>
+            </div>
 
             <!-- Days Off Information Section -->
-            <section class="profile-section">
-                <h2>{% trans 'Days Off' %}</h2>
+            <section class="profile">
+            <div class="container">
+                <h3>{% trans 'Days Off' %}</h3>
                 <a href="{% url 'appointment:add_day_off' staff_user_id=user.id %}"
-                   class="section-content-button modify-btn button-color-green">
+                   class="btn btn-sm section-content-button modify-btn button-color-green btn-phoenix-success">
                     <i class="fas fa-add"></i>
                 </a>
                 <small>
                     {% trans "Days off are days you're not working, you need to set them for holidays as well so clients don't book you those days." %}
                 </small>
-                <div class="responsive-table-container">
-                    <table>
+                <div class="table-responsive">
+              <table class="table table-sm fs-9 mb-1">
                         <thead>
                         <tr>
                             <th>{% trans 'Start date' %}</th>
@@ -113,15 +101,15 @@
                                 <td>{{ day_off.end_date }}</td>
                                 <td>{{ day_off.description }}</td>
                                 <td>
-                                    <div class="buttons-container">
+                                    <div class="btn-group btn-group-sm">
                                         {% if superuser %}
                                             <a href="{% url 'appointment:update_day_off_id' day_off_id=day_off.id staff_user_id=user.id %}"
-                                               class="modify-btn button-color-blue">
+                                               class="btn btn-sm modify-btn button-color-blue btn-phoenix-primary">
                                                 <i class="fas fa-pen"></i>
                                             </a>
                                         {% else %}
                                             <a href="{% url 'appointment:update_day_off' day_off_id=day_off.id %}"
-                                               class="modify-btn button-color-blue">
+                                               class="btn btn-sm modify-btn button-color-blue btn-phoenix-primary">
                                                 <i class="fas fa-pen"></i>
                                             </a>
                                         {% endif %}
@@ -129,13 +117,13 @@
                                         {% if superuser %}
                                             <a href="javascript:void(0)"
                                                onclick="showModal('{{ modal_title }}', '{{ d_modal_message }}', '{{ delete_btn_modal }}', '{% url 'appointment:delete_day_off_id' day_off_id=day_off.id staff_user_id=user.id %}', null)"
-                                               class="modify-btn button-color-red">
+                                               class="modify-btn button-color-red btn btn-sm btn-phoenix-danger">
                                                 <i class="fas fa-trash"></i>
                                             </a>
                                         {% else %}
                                             <a href="javascript:void(0)"
                                                onclick="showModal('{{ modal_title }}', '{{ d_modal_message }}', '{{ delete_btn_modal }}', '{% url 'appointment:delete_day_off' day_off_id=day_off.id %}', null)"
-                                               class="modify-btn button-color-red">
+                                               class="modify-btn button-color-red btn btn-sm btn-phoenix-danger">
                                                 <i class="fas fa-trash"></i>
                                             </a>
                                         {% endif %}
@@ -150,20 +138,22 @@
                         </tbody>
                     </table>
                 </div>
+            </div>
             </section>
 
             <!-- Working Hours Information Section -->
-            <section class="profile-section">
-                <h2>{% trans 'Working Hours' %}</h2>
+            <section class="profile">
+            <div class="container">
+                <h3>{% trans 'Working Hours' %}</h3>
                 <a href="{% url 'appointment:add_working_hours_id' user.id %}"
-                   class="section-content-button modify-btn button-color-green">
+                   class="section-content-button modify-btn button-color-green btn btn-sm btn-phoenix-success">
                     <i class="fas fa-add"></i>
                 </a>
                 <small>
                     {% trans "Note: If you are a staff member, your working hours will be used to determine when you are available for appointments." %}
                 </small>
-                <div class="responsive-table-container">
-                    <table>
+                <div class="table-responsive">
+              <table class="table table-sm fs-9 mb-1">
                         <thead>
                         <tr>
                             <th>{% trans 'Day' %}</th>
@@ -182,12 +172,12 @@
                                     <div class="buttons-container">
                                         {% if superuser %}
                                             <a href="{% url 'appointment:update_working_hours_id' working_hours_id=working_hour.id staff_user_id=user.id %}"
-                                               class="modify-btn button-color-blue">
+                                               class="modify-btn button-color-blue btn btn-sm btn-phoenix-primary">
                                                 <i class="fas fa-pen"></i>
                                             </a>
                                         {% else %}
                                             <a href="{% url 'appointment:update_working_hours' working_hours_id=working_hour.id %}"
-                                               class="modify-btn button-color-blue">
+                                               class="modify-btn button-color-blue btn btn-sm btn-phoenix-primary">
                                                 <i class="fas fa-pen"></i>
                                             </a>
                                         {% endif %}
@@ -195,13 +185,13 @@
                                         {% if superuser %}
                                             <a href="javascript:void(0)"
                                                onclick="showModal('{{ modal_title }}', '{{ w_modal_message }}', '{{ delete_btn_modal }}', '{% url 'appointment:delete_working_hours_id' working_hours_id=working_hour.id staff_user_id=user.id %}', null)"
-                                               class="modify-btn button-color-red">
+                                               class="modify-btn button-color-red btn btn-sm btn-phoenix-danger">
                                                 <i class="fas fa-trash"></i>
                                             </a>
                                         {% else %}
                                             <a href="javascript:void(0)"
                                                onclick="showModal('{{ modal_title }}', '{{ w_modal_message }}', '{{ delete_btn_modal }}', '{% url 'appointment:delete_working_hours' working_hours_id=working_hour.id %}', null)"
-                                               class="modify-btn button-color-red">
+                                               class="modify-btn button-color-red btn btn-sm btn-phoenix-danger">
                                                 <i class="fas fa-trash"></i>
                                             </a>
                                         {% endif %}
@@ -216,19 +206,21 @@
                         </tbody>
                     </table>
                 </div>
+            </div>
             </section>
 
             <!-- Service Information Section -->
-            <section class="profile-section">
-                <h2>{% trans 'Service Offered' %}</h2>
+            <section class="profile">
+            <div class="container">
+                <h3>{% trans 'Service Offered' %}</h3>
                 <small>
                     {% if not superuser %}
                         {% trans "To add/modify a new service, make a request to an admin." %}
                         {% trans "Changes made in one service will change it for every staff member." %}
                     {% endif %}
                 </small>
-                <div class="responsive-table-container">
-                    <table>
+                <div class="table-responsive">
+              <table class="table table-sm fs-9 mb-0">
                         <thead>
                         <tr>
                             <th>{% trans 'Name' %}</th>
@@ -255,23 +247,15 @@
                         </tbody>
                     </table>
                 </div>
+            </div>
             </section>
-        </div>
+
 
         {% include 'modal/confirm_modal.html' %}
-    </section>
 {% endblock %}
 {% block customJS %}
     <!-- Bootstrap's JS and CSS (if not already included) -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js"
-            integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.8/umd/popper.min.js"
-            integrity="sha512-TPh2Oxlg1zp+kz3nFA0C5vVC6leG/6mm1z9+mA81MI5eaUVqasPLO8Cuk4gMF4gUfP5etR73rgU/8PNMsSesoQ=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.2/js/bootstrap.min.js"
-            integrity="sha512-WW8/jxkELe2CAiE4LvQfwm1rajOS8PHasCCx+knHG0gBHt8EXxS6T6tJRTGuDQVnluuAvMxWF4j8SNFDKceLFg=="
-            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
 
     <!-- Our custom modal JS -->
     <script src="{% static 'js/modal/show_modal.js' %}"></script>
diff --git a/templates/appointment/appointment_client_information.html b/templates/appointment/appointment_client_information.html
index acac34a0..02202c6e 100644
--- a/templates/appointment/appointment_client_information.html
+++ b/templates/appointment/appointment_client_information.html
@@ -16,12 +16,7 @@
 {% block body %}
     <div class="main-container">
         <div class="body-container">
-            {% if messages %}
-                {% for message in messages %}
-                    <div class="alert alert-dismissible {% if message.tags %}alert-{% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}danger{% else %}{{ message.tags }}{% endif %}{% endif %}"
-                         role="alert">{{ message }}</div>
-                {% endfor %}
-            {% endif %}
+
 
             <form method="post"
                   action="{% url 'appointment:appointment_client_information' ar.id ar.get_id_request %}"
diff --git a/templates/appointment/appointments.html b/templates/appointment/appointments.html
index 12e86caf..f610a712 100644
--- a/templates/appointment/appointments.html
+++ b/templates/appointment/appointments.html
@@ -20,6 +20,7 @@
                 <small class="page-description">
                     {% trans "Check out our availability and book the date and time that works for you" %}
                 </small>
+
                 <hr>
 
                 <div class="djangoAppt_page-body">
diff --git a/templates/base.html b/templates/base.html
index fea783c1..8c3dc33b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -53,7 +53,6 @@
         integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="
         crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
-
 {% block customCSS %}
 {% endblock %}
 </head>
@@ -109,7 +108,8 @@ function notify(tag,msg){
    {% block customJS %}
     <script src="{% static 'django_ledger/bundle/djetler.bundle.js' %}"></script>
 
-
+<script src="{% static 'js/js-utils.js' %}"></script>
+ <script src="{% static 'js/modal/show_modal.js' %}"></script>
     {% endblock %}
 
     <!-- ===============================================-->
@@ -125,6 +125,7 @@ function notify(tag,msg){
     <script src="{% static 'vendors/feather-icons/feather.min.js' %}"></script>
     <script src="{% static 'vendors/dayjs/dayjs.min.js' %}"></script>
     <script src="{% static 'js/phoenix.js' %}"></script>
+
     <script src="{% static 'vendors/echarts/echarts.min.js' %}"></script>
     <script src="{% static 'js/crm-analytics.js' %}"></script>
     <script src="{% static 'js/travel-agency-dashboard.js' %}"></script>
diff --git a/templates/crm/leads/lead_detail.html b/templates/crm/leads/lead_detail.html
index 18fe3b10..8a911b08 100644
--- a/templates/crm/leads/lead_detail.html
+++ b/templates/crm/leads/lead_detail.html
@@ -31,8 +31,8 @@
                       <div class="row align-items-center g-3 text-center text-xxl-start">
                         <div class="col-6 col-sm-auto flex-1">
                             <h3 class="fw-bolder mb-2">{{ lead.first_name }} {{ lead.last_name }}</h3>
-                            {% if lead.assigned %}
-                            <p class="fs-8 mb-0 white-space-nowrap fw-bold">{{ _("Assigned to")}}: <span class="fw-light">{{ lead.assigned.name }}</span></p>
+                            {% if lead.staff %}
+                            <p class="fs-8 mb-0 white-space-nowrap fw-bold">{{ _("Assigned to")}}: <span class="fw-light">{{ lead.staff.user.get_full_name }}</span></p>
                             {% else %}
                               <p class="mb-0 fw-bold">{{ _("Not Assigned")}}</p>
                             {% endif %}
@@ -123,9 +123,9 @@
             <div class="col-md-7 col-lg-7 col-xl-8">
 
                   <ul class="nav nav-underline fs-9 deal-details scrollbar flex-nowrap w-100 pb-1 mb-6" id="myTab" role="tablist" style="overflow-y: hidden;">
-                <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link active" id="activity-tab" data-bs-toggle="tab" href="#tab-activity" role="tab" aria-controls="tab-activity" aria-selected="false" tabindex="-1"> <span class="fa-solid fa-chart-line me-2 tab-icon-color"></span>Activity</a></li>
-                <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="notes-tab" data-bs-toggle="tab" href="#tab-notes" role="tab" aria-controls="tab-notes" aria-selected="false" tabindex="-1"> <span class="fa-solid fa-clipboard me-2 tab-icon-color"></span>Notes</a></li>
-                <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="emails-tab" data-bs-toggle="tab" href="#tab-emails" role="tab" aria-controls="tab-emails" aria-selected="true"> <span class="fa-solid fa-envelope me-2 tab-icon-color"></span>Emails </a></li>
+                <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link active" id="activity-tab" data-bs-toggle="tab" href="#tab-activity" role="tab" aria-controls="tab-activity" aria-selected="false" tabindex="-1"> <span class="fa-solid fa-chart-line me-2 tab-icon-color"></span>{{ _("Activity") }}</a></li>
+                <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="notes-tab" data-bs-toggle="tab" href="#tab-notes" role="tab" aria-controls="tab-notes" aria-selected="false" tabindex="-1"> <span class="fa-solid fa-clipboard me-2 tab-icon-color"></span>{{ _("Notes") }}</a></li>
+                <li class="nav-item text-nowrap me-2" role="presentation"><a class="nav-link" id="emails-tab" data-bs-toggle="tab" href="#tab-emails" role="tab" aria-controls="tab-emails" aria-selected="true"> <span class="fa-solid fa-envelope me-2 tab-icon-color"></span>{{ _("Emails") }}</a></li>
               </ul>
               <div class="tab-content" id="myTabContent">
               <div class="tab-pane fade active show" id="tab-activity" role="tabpanel" aria-labelledby="activity-tab">
@@ -136,8 +136,8 @@
                     <div class="row justify-content-between align-items-md-center hover-actions-trigger btn-reveal-trigger border-translucent py-3 gx-0 border-top">
                       <div class="col-12 col-lg-auto">
                         <div class="d-flex ms-4 lh-1 align-items-center">
-                            <p class="text-body-tertiary fs-9 ps-lg-3 fw-bold mb-md-0 mb-0">{{ activity.activity_type }} </p>
-                            <p class="text-body-tertiary fs-10 ps-lg-3 mb-md-0 mb-0"> {{ _("by") }}: {{ activity.created_by.dealer.staff }} </p>
+                            <p class="text-body-tertiary fs-9 ps-lg-3 fw-bold mb-md-0 mb-0">{{ activity.activity_type|capfirst }} </p>
+                            <p class="text-body-tertiary fs-10 ps-lg-3 mb-md-0 mb-0"> {{ _("by") }}: {{ activity.created_by.staff.user.get_full_name }} </p>
                             <p class="text-body-tertiary fs-10 ps-lg-3 mb-md-0 mb-0"> {{ _("on") }}: {{ activity.created }} </p>
                         </div>
                       </div>
@@ -156,9 +156,10 @@
                         <table class="table fs-9 mb-0">
                           <thead>
                             <tr>
-                              <th class="align-middle pe-6 text-uppercase text-start" scope="col" style="width:40%;">Note</th>
-                              <th class="align-middle text-start text-uppercase" scope="col" style="width:20%;">Created By</th>
-                              <th class="align-middle text-start text-uppercase white-space-nowrap" scope="col" style="width:20%;">Created On</th>
+                              <th class="align-middle pe-6 text-uppercase text-start" scope="col" style="width:40%;">{{ _("Note") }}</th>
+                              <th class="align-middle text-start text-uppercase" scope="col" style="width:20%;">{{ _("Created By")}}</th>
+                              <th class="align-middle text-start text-uppercase white-space-nowrap" scope="col" style="width:20%;">
+                                  {{ _("Created On")}}</th>
                               <th class="align-middle pe-0 text-end" scope="col" style="width:10%;"> </th>
                             </tr>
                           </thead>
@@ -176,9 +177,9 @@
                                 <div class="btn-reveal-trigger position-static">
                                   <button class="btn btn-sm dropdown-toggle dropdown-caret-none transition-none btn-reveal" type="button" data-bs-toggle="dropdown" data-boundary="window" aria-haspopup="true" aria-expanded="false" data-bs-reference="parent"><span class="fas fa-ellipsis-h fs-10"></span></button>
                                   <div class="dropdown-menu dropdown-menu-end py-2">
-                                      <a class="dropdown-item" href="">View</a>
+                                      <a class="dropdown-item" href="">{{ _("View") }}</a>
                                     <div class="dropdown-divider"></div>
-                                      <a class="dropdown-item text-danger" href="">Remove</a>
+                                      <a class="dropdown-item text-danger" href="">{{ _("Remove") }}</a>
                                   </div>
                                 </div>
                               </td>
diff --git a/templates/crm/leads/lead_list.html b/templates/crm/leads/lead_list.html
index 43f2ec2c..ed393ade 100644
--- a/templates/crm/leads/lead_list.html
+++ b/templates/crm/leads/lead_list.html
@@ -72,7 +72,7 @@
                                     <div class="d-flex align-items-center bg-info-subtle rounded me-2"><span class="text-info-dark" data-feather="database"></span></div>
                                     <span>{{ _("Source")|capfirst }}</span>
                                 </div>
-                            </th>``
+                            </th>
                             <th class="align-middle white-space-nowrap text-uppercase" scope="col" style="width: 10%;">
                                 <div class="d-inline-flex flex-center">
                                     <div class="d-flex align-items-center bg-warning-subtle rounded me-2"><span class="text-warning-dark" data-feather="grid"></span></div>
diff --git a/templates/crm/leads/schedule_lead.html b/templates/crm/leads/schedule_lead.html
index 3f15c4ac..3da74aa4 100644
--- a/templates/crm/leads/schedule_lead.html
+++ b/templates/crm/leads/schedule_lead.html
@@ -2,7 +2,7 @@
 {% load i18n static crispy_forms_filters %}
 
 {% block content %}
-<h1>{% if object %}Update{% else %}Create{% endif %}</h1>
+<h1>{% if object %}{{ _("Update") }}{% else %}{{ _("Create") }}{% endif %}</h1>
 <form method="post">
     {% csrf_token %}
     {{ form|crispy }}
diff --git a/templates/header.html b/templates/header.html
index aed706bf..f89e2dc2 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -250,7 +250,7 @@
             <div class="parent-wrapper label-1">
               <ul class="nav collapse parent" data-bs-parent="#navbarVerticalCollapse" id="nv-reports">                
                   <li class="nav-item">                  
-                  {% if request.user.is_authenticated %}
+                  {% if request.user.is_authenticated and request.user.dealer %}
                   <a class="nav-link" href="{% url 'entity-dashboard' request.user.dealer.entity.slug %}">
                     {% else %}
                   <a class="nav-link" href="#">
@@ -259,7 +259,7 @@
                       <span class="nav-link-icon"><span data-feather="package"></span></span><span class="nav-link-text">{% trans 'Dashboard'|capfirst %}</span>
                     </div>
                   </a>
-                  {% if request.user.is_authenticated %}
+                  {% if request.user.is_authenticated and request.user.dealer %}
                   <a class="nav-link" href="{% url 'entity-cf' request.user.dealer.entity.slug %}">
                     {% else %}
                   <a class="nav-link" href="#">
@@ -268,7 +268,7 @@
                       <span class="nav-link-icon"><span data-feather="package"></span></span><span class="nav-link-text">{% trans 'Cash Flow'|capfirst %}</span>
                     </div>
                   </a>
-                  {% if request.user.is_authenticated %}
+                  {% if request.user.is_authenticated and request.user.dealer %}
                   <a class="nav-link" href="{% url 'entity-ic' request.user.dealer.entity.slug %}">
                     {% else %}
                   <a class="nav-link" href="#">
@@ -277,7 +277,7 @@
                       <span class="nav-link-icon"><span data-feather="package"></span></span><span class="nav-link-text">{% trans 'Income Statement'|capfirst %}</span>
                     </div>
                   </a>
-                  {% if request.user.is_authenticated %}
+                  {% if request.user.is_authenticated and request.user.dealer %}
                   <a class="nav-link" href="{% url 'entity-bs' request.user.dealer.entity.slug %}">
                     {% else %}
                   <a class="nav-link" href="#">
diff --git a/templates/ledger/bank_accounts/bank_account_delete.html b/templates/ledger/bank_accounts/bank_account_delete.html
new file mode 100644
index 00000000..566549bd
--- /dev/null
+++ b/templates/ledger/bank_accounts/bank_account_delete.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/modal/confirm_modal.html b/templates/modal/confirm_modal.html
index da3daab8..b4616be7 100644
--- a/templates/modal/confirm_modal.html
+++ b/templates/modal/confirm_modal.html
@@ -5,18 +5,20 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="modalLabel">Modal title</h5>
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"
+                <button type="button"
+                        class="btn-close"
+                        data-dismiss="modal"
+                        aria-label="{% trans 'Close' %}"
                         onclick="closeConfirmModal()">
-                    <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body" id="modalBody">
                 Modal body text goes here.
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal"
+                <button type="button" class="btn btn-sm btn-phoenix-secondary" data-dismiss="modal"
                         onclick="closeConfirmModal()">{% trans 'Close' %}</button>
-                <a href="#" class="btn btn-primary" id="modalActionBtn">{% trans 'Action' %}</a>
+                <a href="#" class="btn btn-sm btn-phoenix-danger" id="modalActionBtn">{% trans 'Action' %}</a>
             </div>
         </div>
     </div>
diff --git a/templates/modal/error_modal.html b/templates/modal/error_modal.html
index 0213a1bd..11cba8be 100644
--- a/templates/modal/error_modal.html
+++ b/templates/modal/error_modal.html
@@ -13,7 +13,7 @@
                 <p id="errorModalMessage"></p>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"
+                <button type="button" class="btn btn-phoenix-secondary" data-bs-dismiss="modal"
                         onclick="closeErrorModal()">{% trans 'Close' %}</button>
             </div>
         </div>
diff --git a/templates/modal/event_details_modal.html b/templates/modal/event_details_modal.html
index 5f141122..cc41bcfe 100644
--- a/templates/modal/event_details_modal.html
+++ b/templates/modal/event_details_modal.html
@@ -13,20 +13,20 @@
                 <!-- Event details will be populated here -->
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-success" id="eventGoBtn"
+                <button type="button" class="btn btn-phoenix-success" id="eventGoBtn"
                         onclick="goToEvent()">{% trans 'Go' %}</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal"
+                <button type="button" class="btn btn-phoenix-secondary" data-dismiss="modal"
                         onclick="closeModal()">{% trans 'Close' %}
                 </button>
-                <button type="button" class="btn btn-secondary" id="eventCancelBtn" style="display: none;"
+                <button type="button" class="btn btn-phoenix-secondary" id="eventCancelBtn" style="display: none;"
                         onclick="cancelEdit()">{% trans 'Cancel' %}
                 </button>
-                <button type="button" class="btn btn-primary" id="eventEditBtn"
+                <button type="button" class="btn btn-phoenix-primary" id="eventEditBtn"
                         onclick="toggleEditMode()">{% trans 'Edit' %}</button>
                 <button type="button" class="btn btn-primary" id="eventSubmitBtn" style="display: none;"
                         onclick="submitChanges()">{% trans 'Submit' %}
                 </button>
-                <button type="button" class="btn btn-danger" id="eventDeleteBtn"
+                <button type="button" class="btn btn-phoenix-danger" id="eventDeleteBtn"
                         onclick="deleteAppointment()" style="display: none;">
                     {% trans 'Delete' %}
                 </button>
diff --git a/templates/sales/estimates/estimate_form.html b/templates/sales/estimates/estimate_form.html
index 10b20d8f..dfd3d0f6 100644
--- a/templates/sales/estimates/estimate_form.html
+++ b/templates/sales/estimates/estimate_form.html
@@ -2,18 +2,18 @@
 {% load crispy_forms_filters %}
 {% load i18n static %}
 
-{% block title %}{{ _("Create Estimate") }}{% endblock title %}
+{% block title %}{{ _("Create Quotation") }}{% endblock title %}
 
 {% block content %}
 <div class="row mt-4">
-    <h3 class="text-center">{% trans "Create Estimate" %}</h3>
+    <h3 class="text-center">{% trans "Create Quotation" %}</h3>
     <form id="mainForm" method="post" class="needs-validation">
         {% csrf_token %}
         <div class="row g-3">
             {{ form|crispy }}            
             <div class="row mt-5">
                 <div id="formrow">
-                    <h3 class="text-start">Unit Items</h3>
+                    <h3 class="text-start">{{ _("Cars") }}</h3>
                     <div class="form-row row g-3 mb-3 mt-5">
                         <div class="mb-2 col-sm-2">
                             <select class="form-control item" name="item[]" required>
@@ -26,12 +26,12 @@
                             <input class="form-control quantity" type="number" placeholder="Quantity" name="quantity[]" required>
                         </div>
                         <div class="mb-2 col-sm-1">
-                            <button class="btn btn-danger removeBtn">Remove</button>
+                            <button class="btn btn-sm btn-danger removeBtn">{{ _("Remove") }}</button>
                         </div>
                     </div>
                 </div>
                 <div class="col-12">
-                    <button id="addMoreBtn" class="btn btn-primary">Add More</button>
+                    <button id="addMoreBtn" class="btn btn-sm btn-primary">{{ _("Add More")}}</button>
                 </div>
             </div>
         </div>
diff --git a/templates/sales/orders/order_list.html b/templates/sales/orders/order_list.html
index c6abd062..d3f24eaf 100644
--- a/templates/sales/orders/order_list.html
+++ b/templates/sales/orders/order_list.html
@@ -13,7 +13,7 @@
                 <tr>
                     <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Order Number" %}</th>
                     <th class="sort white-space-nowrap align-middle" scope="col">{% trans "Customer" %}</th>
-                    <th class="sort white-space-nowrap align-middle" scope="col">{% trans "For Estimate" %}</th>                    
+                    <th class="sort white-space-nowrap align-middle" scope="col">{% trans "For Quotation" %}</th>
                 </tr>
             </thead>
             <tbody class="list">