diff --git a/osinaweb/addressbook/__pycache__/__init__.cpython-312.pyc b/osinaweb/addressbook/__pycache__/__init__.cpython-312.pyc
index 9244fc57..e7d71020 100644
Binary files a/osinaweb/addressbook/__pycache__/__init__.cpython-312.pyc and b/osinaweb/addressbook/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/admin.cpython-312.pyc b/osinaweb/addressbook/__pycache__/admin.cpython-312.pyc
index 07a937b9..2fbf497d 100644
Binary files a/osinaweb/addressbook/__pycache__/admin.cpython-312.pyc and b/osinaweb/addressbook/__pycache__/admin.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/apps.cpython-312.pyc b/osinaweb/addressbook/__pycache__/apps.cpython-312.pyc
index 7a398fed..a7ca02f9 100644
Binary files a/osinaweb/addressbook/__pycache__/apps.cpython-312.pyc and b/osinaweb/addressbook/__pycache__/apps.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/models.cpython-312.pyc b/osinaweb/addressbook/__pycache__/models.cpython-312.pyc
index fd5845d1..89077d80 100644
Binary files a/osinaweb/addressbook/__pycache__/models.cpython-312.pyc and b/osinaweb/addressbook/__pycache__/models.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-312.pyc b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-312.pyc
index 75b34e6d..2b33ecb8 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-312.pyc and b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-312.pyc b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-312.pyc
index fe551f1b..729fcea9 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-312.pyc and b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-312.pyc b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-312.pyc
index ce6108e2..50f5670e 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-312.pyc and b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-312.pyc b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-312.pyc
index dd75e703..1a5e237a 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-312.pyc and b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-312.pyc b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-312.pyc
index 7f3e16a8..ac56b33b 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-312.pyc and b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-312.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-312.pyc b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-312.pyc
index 4fd413b1..ebcc9f5b 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-312.pyc and b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/billing/__pycache__/__init__.cpython-312.pyc b/osinaweb/billing/__pycache__/__init__.cpython-312.pyc
index fb141d2c..1ae32d16 100644
Binary files a/osinaweb/billing/__pycache__/__init__.cpython-312.pyc and b/osinaweb/billing/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/billing/__pycache__/admin.cpython-312.pyc b/osinaweb/billing/__pycache__/admin.cpython-312.pyc
index 85a24162..90cb9638 100644
Binary files a/osinaweb/billing/__pycache__/admin.cpython-312.pyc and b/osinaweb/billing/__pycache__/admin.cpython-312.pyc differ
diff --git a/osinaweb/billing/__pycache__/apps.cpython-312.pyc b/osinaweb/billing/__pycache__/apps.cpython-312.pyc
index 7758dfd8..62de5230 100644
Binary files a/osinaweb/billing/__pycache__/apps.cpython-312.pyc and b/osinaweb/billing/__pycache__/apps.cpython-312.pyc differ
diff --git a/osinaweb/billing/__pycache__/models.cpython-312.pyc b/osinaweb/billing/__pycache__/models.cpython-312.pyc
index ecfc6235..1eceb237 100644
Binary files a/osinaweb/billing/__pycache__/models.cpython-312.pyc and b/osinaweb/billing/__pycache__/models.cpython-312.pyc differ
diff --git a/osinaweb/billing/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/__pycache__/urls.cpython-312.pyc
index 412f0bc6..627eb30b 100644
Binary files a/osinaweb/billing/__pycache__/urls.cpython-312.pyc and b/osinaweb/billing/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/billing/__pycache__/views.cpython-312.pyc b/osinaweb/billing/__pycache__/views.cpython-312.pyc
index 07bc1c03..dc3bf600 100644
Binary files a/osinaweb/billing/__pycache__/views.cpython-312.pyc and b/osinaweb/billing/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc
index eaa0a8cf..099acb1b 100644
Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc
index d87a2ed0..f40ce916 100644
Binary files a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/billing/add/urls.py b/osinaweb/billing/add/urls.py
index aae47422..96894a68 100644
--- a/osinaweb/billing/add/urls.py
+++ b/osinaweb/billing/add/urls.py
@@ -6,5 +6,6 @@ urlpatterns = [
     path('product', views.add_product, name='addproduct'),
     path('service', views.add_service, name='addservice'),
     path('order/<int:customer_id>/', views.add_order, name='addorder'),
+
     path('invoice/<int:order_id>/', views.add_invoice_pdf, name='addinvoice'),
 ]
diff --git a/osinaweb/billing/add/views.py b/osinaweb/billing/add/views.py
index 798ee4ff..44159426 100644
--- a/osinaweb/billing/add/views.py
+++ b/osinaweb/billing/add/views.py
@@ -114,6 +114,7 @@ def add_order (request, customer_id):
 
 
 
+
 def add_invoice_pdf(request, order_id):
 
     order = get_object_or_404(Order, id=order_id)
@@ -163,19 +164,20 @@ def add_invoice_pdf(request, order_id):
     )
 
 
+    # Save PDF to a file
+    pdf_file_path = os.path.join(settings.MEDIA_ROOT, f'invoice_{invoice.id}.pdf')
+    with open(pdf_file_path, 'wb') as pdf_file:
+        pdf_file.write(pdf)
+
     # Associate PDF file path with the Invoice object
-    pdf_content = ContentFile(pdf)
-    filename = f'invoice_{invoice.invoice_number}.pdf'
-    invoice.pdf.save(filename, pdf_content, save=True)
+    invoice.pdf = pdf_file_path
+    invoice.save()
+
     # Return PDF
     response = HttpResponse(pdf, content_type='application/pdf')
     response['Content-Disposition'] = 'attachment; filename="my_pdf.pdf"'
 
-    return response
-
-
-
-
+    return response

 
 
 
diff --git a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-312.pyc
index bdb1a556..91526068 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-312.pyc
index 53eefc61..71a8a4b0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-312.pyc
index bd384a68..f8295437 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-312.pyc
index 8282be15..c5d5c4e3 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-312.pyc
index e61cefda..2ed4bc47 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-312.pyc
index 74fd02eb..df8f1c6d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-312.pyc
index d1912b48..0d27a7cc 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-312.pyc
index 2e4f867f..93dcfab1 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-312.pyc
index f1f85623..f8f965c0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-312.pyc
index 6c3e88bf..ab1fc8a9 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-312.pyc
index 04a882c9..a9c3bc48 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-312.pyc
index e4cffdc3..10a101b6 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-312.pyc
index 0e27b089..58c5d882 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-312.pyc
index 277d564a..34daa1ab 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-312.pyc
index 829dc9cb..f5177707 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-312.pyc
index 7344fc85..6ac0d79e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-312.pyc
index 53def03f..c12408d6 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-312.pyc
index 5469cc0f..66629e38 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-312.pyc
index 47061236..49e856a4 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-312.pyc
index 35804d98..5cdd0331 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-312.pyc
index ced94079..8c092217 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-312.pyc
index b4410d5c..27d948db 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-312.pyc
index 866bf7f0..66e5dfbe 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-312.pyc
index b543b4df..6ab20917 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-312.pyc
index a8c7e152..cd806830 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-312.pyc
index c16c775a..dcc967ae 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-312.pyc
index 22b6ce4a..3ca58f4a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-312.pyc
index 6c14085a..875b5dfd 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-312.pyc
index b9e087d0..9481aad3 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-312.pyc
index 7d524b6d..1258fa2a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-312.pyc
index f0e576d1..566d1768 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-312.pyc
index b7551eec..34a4c4f0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-312.pyc
index 5c0220df..93efa9a5 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-312.pyc
index 1558cb7b..084b282e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-312.pyc
index 5a464e0c..9f7c13e2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-312.pyc
index 9dc2e169..dbad91bb 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-312.pyc
index 0a5f408b..6c9bfd03 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-312.pyc
index e892ca23..f7ad379e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc
index ce975d65..5acbe51e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-312.pyc
index a2ebcf02..a64468aa 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-312.pyc
index f13b1cdf..4273e3c0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-312.pyc
index fe36befe..745042d9 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-312.pyc
new file mode 100644
index 00000000..ba028add
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-312.pyc
new file mode 100644
index 00000000..2f9b5a0b
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-312.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/__init__.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/__init__.cpython-312.pyc
index ed35a163..20e70044 100644
Binary files a/osinaweb/billing/migrations/__pycache__/__init__.cpython-312.pyc and b/osinaweb/billing/migrations/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/__init__.cpython-312.pyc b/osinaweb/customercore/__pycache__/__init__.cpython-312.pyc
index 020d28a3..32a0d1ad 100644
Binary files a/osinaweb/customercore/__pycache__/__init__.cpython-312.pyc and b/osinaweb/customercore/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/admin.cpython-312.pyc b/osinaweb/customercore/__pycache__/admin.cpython-312.pyc
index 1332b2a6..f7c78b43 100644
Binary files a/osinaweb/customercore/__pycache__/admin.cpython-312.pyc and b/osinaweb/customercore/__pycache__/admin.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/apps.cpython-312.pyc b/osinaweb/customercore/__pycache__/apps.cpython-312.pyc
index 4e033040..e62a88e7 100644
Binary files a/osinaweb/customercore/__pycache__/apps.cpython-312.pyc and b/osinaweb/customercore/__pycache__/apps.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc
index a4d04025..470d62a3 100644
Binary files a/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc and b/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/decorators.cpython-312.pyc b/osinaweb/customercore/__pycache__/decorators.cpython-312.pyc
index 7d04babc..a9eb960f 100644
Binary files a/osinaweb/customercore/__pycache__/decorators.cpython-312.pyc and b/osinaweb/customercore/__pycache__/decorators.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/models.cpython-312.pyc b/osinaweb/customercore/__pycache__/models.cpython-312.pyc
index 070923cd..5c9cfe86 100644
Binary files a/osinaweb/customercore/__pycache__/models.cpython-312.pyc and b/osinaweb/customercore/__pycache__/models.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/urls.cpython-312.pyc b/osinaweb/customercore/__pycache__/urls.cpython-312.pyc
index e7797912..867da9e2 100644
Binary files a/osinaweb/customercore/__pycache__/urls.cpython-312.pyc and b/osinaweb/customercore/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/customercore/__pycache__/views.cpython-312.pyc b/osinaweb/customercore/__pycache__/views.cpython-312.pyc
index 3457bec5..35205674 100644
Binary files a/osinaweb/customercore/__pycache__/views.cpython-312.pyc and b/osinaweb/customercore/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-312.pyc
new file mode 100644
index 00000000..da876b0e
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-312.pyc
new file mode 100644
index 00000000..834372b6
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-312.pyc
new file mode 100644
index 00000000..720a3757
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-312.pyc
new file mode 100644
index 00000000..0221a1e9
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-312.pyc
new file mode 100644
index 00000000..715b0943
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-312.pyc
new file mode 100644
index 00000000..651bf33f
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-312.pyc
new file mode 100644
index 00000000..4b7a33f2
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-312.pyc
new file mode 100644
index 00000000..0c6a1617
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-312.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-312.pyc b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-312.pyc
index 099012e7..c3b92252 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-312.pyc and b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html b/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html
index 30d37872..6ebe7751 100644
--- a/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html
+++ b/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html
@@ -9,9 +9,30 @@
             <p class="text-secondosiblue text-xl">Ticket <span class="font-semibold">{{ticket.ticket_number}}</span></p>
 
             <div class="flex justify-start items-center gap-1">
-                <div class="w-[16px] h-[16px] rounded-full bg-red-200 border  shadow-md"></div>
+                <div class="w-[16px] h-[16px] rounded-full bg-red-200 shadow-md"></div>
                 <p class="text-secondosiblue font-light">Closed by Linode at 20-4-24 16:30</p>
             </div>
+
+
+            <div class="w-full mt-3">
+                <p class="text-gray-500 font-light text-sm leading-7">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus sagittis, risus id sollicitudin
+                    maximus, diam velit tempus est, pulvinar cursus arcu nisi nec ligula. Nunc eleifend, est eget
+                    lacinia semper, ligula purus scelerisque nunc, a molestie elit magna quis sem. Curabitur eget auctor
+                    mi, vel sodales purus. Nullam odio erat, convallis sit amet feugiat molestie, fermentum sit amet
+                    purus. Proin eget nunc eget risus tristique tempus. Donec egestas bibendum ligula sit amet porta.
+                </p>
+            </div>
+
+            <div class="w-full flex flex-wrap justify-end items-center gap-3">
+                <a>
+                    <div class="flex items-center gap-1 text-secondosiblue hover:text-gray-500 duration-300 cursor-pointer">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13" />
+                        </svg>       
+                        <p>Filename.docx</p>               
+                    </div>
+                </a>
+            </div>
         </div>
 
 
@@ -23,25 +44,25 @@
                 <div>
                     <div class="w-[45px] s:w-[60px] h-[45px] s:h-[60px] rounded-full shadow-md border border-gray-100">
                         {% if update.added_by.customerprofile %}
-                            {% if update.added_by.customerprofile.image %}
-                            <img src="{{update.added_by.customerprofile.image.url}}"
-                                class="w-full h-full rounded-full object-cover">
-                            {% else %}
-                            <div
+                        {% if update.added_by.customerprofile.image %}
+                        <img src="{{update.added_by.customerprofile.image.url}}"
+                            class="w-full h-full rounded-full object-cover">
+                        {% else %}
+                        <div
                             class="w-full h-full border border-secondosiblue bg-secondosiblue text-white uppercase rounded-full flex justify-center items-center p-1 shadow-md">
                             {{ update.added_by.first_name.0 }}{{ update.added_by.last_name.0 }}
-                            </div>
-                            {% endif %}
+                        </div>
+                        {% endif %}
                         {% elif update.added_by.staffprofile %}
-                            {% if update.added_by.staffprofile.image %}
-                            <img src="{{update.added_by.staffprofile.image.url}}"
-                                class="w-full h-full rounded-full object-cover">
-                            {% else %}
-                            <div
+                        {% if update.added_by.staffprofile.image %}
+                        <img src="{{update.added_by.staffprofile.image.url}}"
+                            class="w-full h-full rounded-full object-cover">
+                        {% else %}
+                        <div
                             class="w-full h-full border border-osiblue bg-osiblue text-white uppercase rounded-full flex justify-center items-center p-1 shadow-md">
                             {{ update.added_by.first_name.0 }}{{ update.added_by.last_name.0 }}
-                            </div>
-                            {% endif %}
+                        </div>
+                        {% endif %}
                         {% endif %}
                     </div>
                 </div>
@@ -50,7 +71,8 @@
                 <div class="w-full replyContainer shadow-md">
                     <div
                         class="w-full bg-gray-100 flex justify-between items-center gap-3 px-3 py-3 cursor-pointer rounded-t-md toggleReply">
-                        <p class="text-secondosiblue font-light text-sm s:text-base"><span class="font-semibold">{{update.added_by.first_name}}</span>
+                        <p class="text-secondosiblue font-light text-sm s:text-base"><span
+                                class="font-semibold">{{update.added_by.first_name}}</span>
                             replied {{update.date_added}}</p>
 
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
@@ -67,9 +89,20 @@
 
                     <div class="w-full bg-white p-5 flex flex-col gap-3 reply">
                         <p class="text-gray-500 font-light leading-8 text-[15px]">
-                          {{update.description}}
+                            {{update.description}}
                         </p>
 
+                        <div class="w-full flex flex-wrap justify-end items-center gap-3">
+                            <a>
+                                <div class="flex items-center gap-1 text-secondosiblue hover:text-gray-500 duration-300 cursor-pointer text-sm">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4 text-secondosiblue">
+                                        <path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13" />
+                                    </svg>       
+                                    <p>Filename.docx</p>               
+                                </div>
+                            </a>
+                        </div>
+
                     </div>
 
                     {% if update.added_by.staffprofile %}
@@ -79,15 +112,18 @@
 
                         <div class="flex justify-start items-center gap-2">
                             <div class="w-fit h-fit rounded-full border-2 border-secondosiblue">
-                                <img src="{% static 'images/icons/happy-icon.png' %}" class="w-[30px] h-[30px] rounded-full cursor-pointer hover:scale-105 duration-300 transition-transform">
+                                <img src="{% static 'images/icons/happy-icon.png' %}"
+                                    class="w-[30px] h-[30px] rounded-full cursor-pointer hover:scale-105 duration-300 transition-transform">
                             </div>
-                            
+
                             <div class="w-fit h-fit rounded-full">
-                                <img src="{% static 'images/icons/neutral-icon.png' %}" class="w-[30px] h-[30px] rounded-full cursor-pointer hover:scale-105 duration-300 transition-transform">
+                                <img src="{% static 'images/icons/neutral-icon.png' %}"
+                                    class="w-[30px] h-[30px] rounded-full cursor-pointer hover:scale-105 duration-300 transition-transform">
                             </div>
 
                             <div class="w-fit h-fit rounded-full">
-                                <img src="{% static 'images/icons/unhappy-icon.png' %}" class="w-[30px] h-[30px] rounded-full cursor-pointer hover:scale-105 duration-300 transition-transform">
+                                <img src="{% static 'images/icons/unhappy-icon.png' %}"
+                                    class="w-[30px] h-[30px] rounded-full cursor-pointer hover:scale-105 duration-300 transition-transform">
                             </div>
                         </div>
                     </div>
@@ -100,30 +136,31 @@
 
 
             <!-- REPLYING SECTION -->
-            <form class="flex gap-3" method="POST" action="{% url 'customeraddticketupdate' ticket.id %}" enctype="multipart/form-data">
+            <form class="flex gap-3" method="POST" action="{% url 'customeraddticketupdate' ticket.id %}"
+                enctype="multipart/form-data">
                 {% csrf_token %}
                 <div>
                     <div class="w-[45px] s:w-[60px] h-[45px] s:h-[60px] rounded-full shadow-md border border-gray-100">
                         {% if request.user.customerprofile %}
-                            {% if request.user.customerprofile.image %}
-                            <img src="{{request.user.customerprofile.image.url}}"
-                                class="w-full h-full rounded-full object-cover">
-                            {% else %}
-                            <div
+                        {% if request.user.customerprofile.image %}
+                        <img src="{{request.user.customerprofile.image.url}}"
+                            class="w-full h-full rounded-full object-cover">
+                        {% else %}
+                        <div
                             class="w-full h-full border border-secondosiblue bg-secondosiblue text-white uppercase rounded-full flex justify-center items-center p-1 shadow-md">
                             {{ request.user.first_name.0 }}{{ request.user.last_name.0 }}
-                            </div>
-                            {% endif %}
+                        </div>
+                        {% endif %}
                         {% elif request.user.staffprofile %}
-                            {% if request.user.staffprofile.image %}
-                            <img src="{{request.user.staffprofile.image.url}}"
-                                class="w-full h-full rounded-full object-cover">
-                            {% else %}
-                            <div
+                        {% if request.user.staffprofile.image %}
+                        <img src="{{request.user.staffprofile.image.url}}"
+                            class="w-full h-full rounded-full object-cover">
+                        {% else %}
+                        <div
                             class="w-full h-full border border-osiblue bg-osiblue text-white uppercase rounded-full flex justify-center items-center p-1 shadow-md">
                             {{ request.user.first_name.0 }}{{ request.user.last_name.0 }}
-                            </div>
-                            {% endif %}
+                        </div>
+                        {% endif %}
                         {% endif %}
                     </div>
                 </div>
@@ -136,14 +173,18 @@
 
 
                     <div class="w-full flex flex-col s:flex-row justify-end items-center gap-3">
-                        <div class="w-full s:w-[50px] h-[50px] rounded-md bg-gray-50 shadow-md border border-gray-100 flex justify-center items-center p-2 cursor-pointer relative hover:scale-105 duration-300 transition-transform">
+                        <div
+                            class="w-full s:w-[50px] h-[50px] rounded-md bg-gray-50 shadow-md border border-gray-100 flex justify-center items-center p-2 cursor-pointer relative hover:scale-105 duration-300 transition-transform">
                             <input type="file" name="file" id="fileInput" class="opacity-0">
 
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5 text-secondosiblue z-10 absolute pointer-events-none">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor"
+                                class="w-5 h-5 text-secondosiblue z-10 absolute pointer-events-none">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13" />
                             </svg>
                         </div>
-         
+
                         <button
                             class="w-full s:w-fit bg-secondosiblue border border-secondosiblue text-white rounded-md cursor-pointer hover:bg-white hover:text-secondosiblue duration-300 px-9 py-3">
                             Send
diff --git a/osinaweb/customercore/templates/listing_pages/customer-tickets.html b/osinaweb/customercore/templates/listing_pages/customer-tickets.html
index 90df9d02..9f95b58e 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-tickets.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-tickets.html
@@ -11,20 +11,21 @@
         <div class="w-full flex flex-col gap-3 mt-4">
             <div class="w-full bg-gray-200 rounded-md shadow-md h-fit p-3 flex items-center justify-between gap-5">
                 <div class="flex items-center gap-5 text-[17px]">
-                    <p class="text-secondosiblue font-semibold cursor-pointer">Open Tickets</p>
-                    <p class="text-gray-500 cursor-pointer">Closed Tickets</p>
+                    <p class="text-secondosiblue font-semibold cursor-pointer" id="openTicketsLink">Open Tickets</p>
+                    <p class="text-gray-500 cursor-pointer" id="closedTicketsLink">Closed Tickets</p>
                 </div>
 
-
                 <a href="{% url 'customeraddticket' %}">
-                    <button class="w-fit px-5 py-2 bg-osiblue border border-osiblue text-white rounded-md cursor-pointer hover:bg-white hover:text-secondosiblue duration-300">
+                    <button
+                        class="w-fit px-5 py-2 bg-osiblue border border-osiblue text-white rounded-md cursor-pointer hover:bg-white hover:text-secondosiblue duration-300">
                         Create Ticket
                     </button>
                 </a>
             </div>
 
 
-            <div class="overflow-x-auto border border-gray-300 rounded-md">
+            <!-- OPEN TICKETS -->
+            <div class="overflow-x-auto border border-gray-300 rounded-md" id="openTickets">
                 <table class="min-w-full divide-y">
                     <!-- TABLE HEADER -->
                     <thead class="bg-gray-50">
@@ -45,51 +46,143 @@
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
                                 Date Created
                             </th>
-                            <th scope="col" class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
                                 Last Updated
                             </th>
-                            <th scope="col" class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
                                 Updated By
                             </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
+                                Unread
+                            </th>
                         </tr>
                     </thead>
-    
+
                     <!-- TABLE BODY -->
                     <tbody class="bg-white divide-y divide-gray-200">
-    
+
+                        {% for ticket in open_tickets %}
                         <tr>
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <a href="">
-                                    <p class="text-secondosiblue cursor-pointer hover:text-gray-500 duration-300">My Account Balance</p>
+                                <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
+                                    <p class="text-secondosiblue cursor-pointer hover:text-gray-500 duration-300">{{ticket.title }}</p>
                                 </a>
                             </td>
-    
+
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">22666766</p>
+                                <p class="text-secondosiblue">{{ ticket.ticket_number }}</p>
                             </td>
-    
+
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">Django</p>
+                                <p class="text-secondosiblue">{{ ticket.regarding }}</p>
                             </td>
-    
+
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">20-2-2024</p>
+                                <p class="text-secondosiblue">{{ ticket.opened_date }}</p>
                             </td>
-    
+
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">20-2-2024</p>
+                                <p class="text-secondosiblue">{{ ticket.last_updated }}</p>
                             </td>
-    
+
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{ ticket.updated_by }}</p>
+                            </td>
+
                             <td class="px-6 py-4 text-center text-sm">
-                                <p class="text-secondosiblue">Ositcom Ltd</p>
+                                <div class="w-full flex justify-center items-center">
+                                    <div class="w-[40px] h-[40px] rounded-full border-2 border-secondosiblue flex justify-center items-center">
+                                        <p class="text-secondosiblue">2</p>
+                                    </div>
+                                </div>
                             </td>
                         </tr>
+                        {% endfor %}
                     </tbody>
                 </table>
             </div>
-        </div>
 
+
+            <!-- CLOSED TICKETS -->
+            <div class="overflow-x-auto border border-gray-300 rounded-md hidden" id="closedTickets">
+                <table class="min-w-full divide-y">
+                    <!-- TABLE HEADER -->
+                    <thead class="bg-gray-50">
+                        <tr>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Subject
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Ticket ID
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Regarding
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Date Created
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
+                                Last Updated
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
+                                Updated By
+                            </th>
+                        </tr>
+                    </thead>
+
+                    <!-- TABLE BODY -->
+                    <tbody class="bg-white divide-y divide-gray-200">
+
+                        {% for ticket in closed_tickets %}
+                        <tr>
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
+                                    <p class="text-secondosiblue cursor-pointer hover:text-gray-500 duration-300">{{ticket.title }}</p>
+                                </a>
+                            </td>
+
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{ ticket.ticket_number }}</p>
+                            </td>
+
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{ ticket.regarding }}</p>
+                            </td>
+
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{ ticket.opened_date }}</p>
+                            </td>
+
+
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{ ticket.last_updated }}</p>
+                            </td>
+
+                            <td class="px-6 py-4 text-center text-sm">
+                                <p class="text-secondosiblue">{{ ticket.updated_by }}</p>
+                            </td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div> 
     </div>
 </div>
 
+
+
+<!---------------------- JS SCRIPTS -------------------->
+
+<script type="text/javascript" src='{% static "js/customer_dashboard/tickets-filtering.js" %}'></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 9ff7b1b8..6bdd2dc4 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-312.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-312.pyc
index 37d12abe..fc0f916b 100644
Binary files a/osinaweb/osinacore/__pycache__/__init__.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc
index ca3c87ae..11240f22 100644
Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/apps.cpython-312.pyc b/osinaweb/osinacore/__pycache__/apps.cpython-312.pyc
index 66bf40ca..88b91e3c 100644
Binary files a/osinaweb/osinacore/__pycache__/apps.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/apps.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-312.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-312.pyc
index 537d3154..ce0b265f 100644
Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/decorators.cpython-312.pyc b/osinaweb/osinacore/__pycache__/decorators.cpython-312.pyc
index dee38651..25258b71 100644
Binary files a/osinaweb/osinacore/__pycache__/decorators.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/decorators.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-312.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-312.pyc
index 239667d6..9ce22e1e 100644
Binary files a/osinaweb/osinacore/__pycache__/forms.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/forms.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/models.cpython-312.pyc b/osinaweb/osinacore/__pycache__/models.cpython-312.pyc
index 3bded541..07e07eb0 100644
Binary files a/osinaweb/osinacore/__pycache__/models.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc
index d3725d1c..3ecfd94e 100644
Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc
index 89c46d17..0cbfa7f4 100644
Binary files a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/add/__pycache__/urls.cpython-312.pyc
index 1cd61b4c..85011252 100644
Binary files a/osinaweb/osinacore/add/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/add/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-312.pyc
index e4e15b84..493cb2fd 100644
Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/serializers.cpython-312.pyc b/osinaweb/osinacore/api/__pycache__/serializers.cpython-312.pyc
index ae28836d..90be0ce9 100644
Binary files a/osinaweb/osinacore/api/__pycache__/serializers.cpython-312.pyc and b/osinaweb/osinacore/api/__pycache__/serializers.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-312.pyc
index 4a368e6c..09020673 100644
Binary files a/osinaweb/osinacore/api/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/api/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-312.pyc
index df0e24b5..c8c61c23 100644
Binary files a/osinaweb/osinacore/api/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/api/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/delete/__pycache__/urls.cpython-312.pyc
index c05eac57..0ea9b1c9 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/delete/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/delete/__pycache__/views.cpython-312.pyc
index 0e67df95..7fe4623e 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/delete/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc
index c58c6daa..0f1b99dd 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc
index 8df78e6c..8b6919ca 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-312.pyc
index 19371521..9fec3130 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-312.pyc
index 1ae366f8..bb13e410 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-312.pyc
index 93424953..56bd8fbf 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-312.pyc
index 93331823..ff4e8f4e 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-312.pyc
index 0b1812dd..aad2e368 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-312.pyc
index 4525ce06..51e81916 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-312.pyc
index 60390911..e09f08aa 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-312.pyc
index 580bf1be..c522c6a0 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-312.pyc
index 8386ed21..f7b3b3fb 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-312.pyc
index b3bb8840..2852c79f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-312.pyc
index ed2dbbd1..b5b55996 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-312.pyc
index ecb864e0..ba0e8952 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-312.pyc
index 1c816fc4..925d298a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-312.pyc
index d5ffdd5f..6ba1da89 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-312.pyc
index ebc3a17c..9ed40f0a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-312.pyc
index 2c827c8c..2fd1c366 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-312.pyc
index ad3bee9f..63150eb9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-312.pyc
index 56b7e176..53761e99 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-312.pyc
index 9f33467e..6aa048b1 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-312.pyc
index fc6b3416..2372136a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-312.pyc
index 40f58b44..89ee0bff 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-312.pyc
index 7640ad7f..656308b1 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-312.pyc
index 82a70308..7713e5cd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-312.pyc
index 79c436e2..c24e4e4f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-312.pyc
index 35dc2c16..ee1c1549 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-312.pyc
index ec4102cc..d6fc8329 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-312.pyc
index f8c73191..59e2d61f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-312.pyc
index aaa8a06f..bb43ad25 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-312.pyc
index 01ddb551..8dd1280d 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-312.pyc
index b1a7f66b..72b7f71c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-312.pyc
index 29ec49a2..03a81f07 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-312.pyc
index 3fc26a9e..acc0b00b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-312.pyc
index 10519164..4d35f01f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-312.pyc
index a5f264bc..6ad58212 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-312.pyc
index ba84895f..31d20c04 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-312.pyc
index 23395e8e..4e44fa0c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-312.pyc
index d6794013..3b24b4ec 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-312.pyc
index d58f0927..085369f4 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-312.pyc
index a46c7f10..1bf540ca 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-312.pyc
index 05d81617..bfff30d7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-312.pyc
index e1b2b7d9..fd966021 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-312.pyc
index f7fbf863..9f56d4b5 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-312.pyc
index e40eea8c..17d643ca 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-312.pyc
index c297c105..e0a29185 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-312.pyc
index 9d1ba1c0..7c08a5a2 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-312.pyc
index fb95c57e..2fe665ce 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-312.pyc
index 7ec78f68..106852b0 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-312.pyc
index d89fc613..77a90017 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-312.pyc
index df48d267..07ac924b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-312.pyc
index 14292f46..97a75909 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-312.pyc
index 0f048e49..950676f0 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-312.pyc
index 5fccd0a8..deca31e3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-312.pyc
index 88301cb6..be6ece71 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-312.pyc
index a2b79528..c4ff3cc8 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-312.pyc
index 2e2dc17c..58be80ff 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-312.pyc
index 71bbb8d3..beaf98d3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-312.pyc
index 13b25eb6..9504c922 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-312.pyc
index bc737e2f..4db285ef 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-312.pyc
index e924db0f..017d0ddb 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-312.pyc
index 841219ee..a91758a9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-312.pyc
index c6a79dab..4ded6d25 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-312.pyc
index f920d7cf..058b072c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-312.pyc
index 10ff89d5..535575dd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-312.pyc
index 2e08011a..f019ea8b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-312.pyc
index cb77b631..9a255d75 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-312.pyc
index 5cdd107d..29fa38c1 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-312.pyc
index 7c2f8365..eebe76d3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-312.pyc
index 2ee272e5..8c248dd7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-312.pyc
index 984a9b96..1de88779 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-312.pyc
new file mode 100644
index 00000000..e77ae633
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-312.pyc
new file mode 100644
index 00000000..a1c71948
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-312.pyc
new file mode 100644
index 00000000..4840d157
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-312.pyc
new file mode 100644
index 00000000..51d57b74
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-312.pyc
new file mode 100644
index 00000000..28185487
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-312.pyc
new file mode 100644
index 00000000..48b62f40
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-312.pyc
index 20f193d4..6460f31f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-312.pyc and b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/osinacore/templates/customer_index.html b/osinaweb/osinacore/templates/customer_index.html
index 37e95950..d6d0bccb 100644
--- a/osinaweb/osinacore/templates/customer_index.html
+++ b/osinaweb/osinacore/templates/customer_index.html
@@ -7,37 +7,38 @@
     <!-- SUBSCRIPTION -->
     <div class="w-full h-fit bg-white rounded-md shadow-md p-5">
         <h1 class="text-secondosiblue text-[25px]">Subscriptions</h1>
-        <div class="w-full grid grid-cols-1 md:grid-cols-2 l:grid-cols-3 xxlg1:grid-cols-4 gap-5 mt-3">
+        <div class="w-full grid grid-cols-1 md:grid-cols-2 l:grid-cols-3 xxlg1:grid-cols-4 gap-x-5 gap-y-14 mt-3 mb-10">
 
             {% for subscription in active_subscriptions %}
             {% if subscription.item.item_type.name == 'OSIMENU' %}
                 <a href="{% url 'redirectosimenu' %}">
-                    <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300">
-                        <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md">
+                    <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300 relative">
+                        <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md relative h-[150px]">
                             {% if subscription.item.item_type.name == 'OSIMENU' %}
-                            <img src="{% static 'images/ositcom_logos/osimenublue.png' %}" class="w-[80%] h-auto">
+                            <img src="{% static 'images/ositcom_logos/osimenublue.png' %}" class="w-[80%] h-auto mt-10">
                             {% endif %}
-                            
-                        </div>
-                        <div class="w-full h-fit rounded-b-md p-5 relative bg-gray-100">
-                            <div class="w-full flex justify-between items-start">
-                                <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
-                                </p>
+
+
+                            <div class="w-fit px-5 py-2 bg-secondosiblue text-white rounded-r-md text-sm absolute top-3 left-0">
+                                <p>Osimenu Basic</p>
                             </div>
                         </div>
+                        <div class="w-[80%] absolute bottom-[-35px] left-1/2 -translate-x-1/2 bg-white border border-gray-100 shadow-md flex justify-center items-center p-3">
+                            <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
+                            </p>
+                        </div>
                     </div>
                 </a>
+
             {% elif subscription.item.item_type.name == 'OSICARD' %}
             <a href="{% url 'redirectosicard' %}">
-                    <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300">
+                    <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300 relative">
                         <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md">
                             <img src="{% static 'images/ositcom_logos/osicardblue.png' %}" class="w-[80%] h-auto">
                         </div>
-                        <div class="w-full h-fit rounded-b-md p-5 relative bg-gray-100">
-                            <div class="w-full flex justify-between items-start">
-                                <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
-                                </p>
-                            </div>
+                        <div class="w-[80%] absolute bottom-[-35px] left-1/2 -translate-x-1/2 bg-white border border-gray-100 shadow-md flex justify-center items-center p-3">
+                            <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
+                            </p>
                         </div>
                     </div>
                 </a>
@@ -114,13 +115,13 @@
                             <p class="text-secondosiblue">Ositcom Ltd</p>
                         </td>
 
-                        <td class="px-6 py-4 text-center items-center text-sm border-r border-gray-300 bg-secondosiblue">
-                           
-                            <p class="text-white"> {{ticket.unread_updates_count}} </p>
-   
+                        <td class="px-6 py-4 text-center items-center text-sm">
+                            <div class="w-full flex justify-center items-center">
+                                <div class="w-[40px] h-[40px] rounded-full border-2 border-secondosiblue flex justify-center items-center">
+                                    <p class="text-secondosiblue">{{ticket.unread_updates_count}}</p>
+                                </div>
+                            </div>  
                         </td>
-
-                      <!-- {{ticket.unread_updates_count}} -->
                     </tr>
                 </tbody>
                 {% endfor %}
diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html
index 9d50451a..99373569 100644
--- a/osinaweb/osinacore/templates/customer_main.html
+++ b/osinaweb/osinacore/templates/customer_main.html
@@ -416,7 +416,7 @@
                     <div class="w-full h-full flex flex-col justify-between items-center">
                         <div class="w-full flex justify-between items-center">
                             <p class="text-[22px] text-secondosiblue font-poppinsBold uppercase">Invoices</p>
-                            <img src="{% static 'images/icons/tasks.png' %}" class="w-[50px]">
+                            <img src="{% static 'images/icons/invoice.png' %}" class="w-[50px]">
                         </div>
                         <div
                             class="w-[60px] h-[60px] bg-white border-2 rounded-full border-secondosiblue flex justify-center items-center">
diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html
index 9097fdc6..9555930b 100644
--- a/osinaweb/osinacore/templates/main.html
+++ b/osinaweb/osinacore/templates/main.html
@@ -9,7 +9,7 @@
     <title>{% block title %} Osina {% endblock %}</title>
     <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-
+    
     <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
     <!-- DRAGGABLE SLIDER LINKS -->
@@ -189,12 +189,9 @@
                         class="w-full bg-transparent border border-white border-opacity-10 py-2 px-3 text-white outline-none rounded-md"
                         placeholder="Search...">
                     <div class="inset-y-0 absolute right-5 flex justify-center items-center text-white">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" class="w-[20px] text-white">
-                            <path stroke-linecap="round" stroke-linejoin="round"
-                                d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[20px] text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
                         </svg>
-
                     </div>
                 </div>
 
@@ -208,13 +205,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
                                 </svg>
-
-
                                 <p class="text-white">Accounts</p>
                             </div>
                             <div>
@@ -254,12 +247,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
                                 </svg>
-
                                 <p class="text-white">My Work</p>
                             </div>
                             <div>
@@ -309,12 +299,9 @@
                     <!-- SUPPORT DROPDOWN -->
                     <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
                         <div class="w-full flex justify-start items-center gap-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
                             </svg>
-
                             <p class="text-white">Support</p>
                         </div>
                         <div>
@@ -329,12 +316,9 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
                                 </svg>
-
                                 <p class="text-white">Billing</p>
                             </div>
                             <div>
@@ -376,17 +360,15 @@
                     </div>
                     {% endif %}
 
+
                     <!-- UTILITIES DROPDOWN -->
                     <div class="w-full menu-container">
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
                                 </svg>
-
                                 <p class="text-white">Utilities</p>
                             </div>
                             <div>
@@ -444,12 +426,9 @@
 
                     <a class="w-full">
                         <div class="w-full flex justify-start items-center gap-3 border-b border-slate-600 py-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
                             </svg>
-
                             <p class="text-white">Activity</p>
                         </div>
                     </a>
@@ -461,8 +440,7 @@
                 class="w-full xlg1:w-[300px] h-fit bg-secondosiblue flex flex-col items-center absolute xlg1:fixed justify-center gap-2 py-2 bottom-0 inset-x-0 mt-[100px]">
                 <div class="w-full flex flex-col justify-center gap-1 items-center">
                     <div class="flex justify-center items-center gap-1">
-                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo"
-                            class="w-[30px] h-[25px]">
+                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo" class="w-[30px] h-[25px]">
                         <p class="text-gray-200 font-light text-xs">Powered By OSITCOM</p>
                     </div>
                     <p class="text-gray-200 font-light text-xs">Copyrights © 2024 All Rights Reserved</p>
@@ -470,7 +448,6 @@
             </div>
         </div>
 
-
         <!-- MOBILE FIXED SIDE BAR -->
         <div class="w-full h-[100vh] absolute bg-black bg-opacity-40 z-50 mt-[80px] mobileFixedSideHeader hidden">
             <div class="w-[70%] h-full bg-osiblue flex flex-col gap-3 relative">
@@ -496,11 +473,9 @@
                     <div class="w-full h-fit bg-secondosiblue px-5 flex flex-col hidden" id="mobileUserProfileDropdown">
                         <a href="{% url 'signout' %}" class="w-full">
                             <div class="w-full py-3 flex items-center gap-2 text-white text-[16px]">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
-                                </svg>
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
+                                </svg>    
                                 <p>Logout</p>
                             </div>
                         </a>
@@ -516,10 +491,8 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
                                 </svg>
                                 <p class="text-white">Accounts</p>
                             </div>
@@ -560,10 +533,8 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
                                 </svg>
                                 <p class="text-white">My Work</p>
                             </div>
@@ -613,10 +584,8 @@
 
                     <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
                         <div class="w-full flex justify-start items-center gap-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
                             </svg>
                             <p class="text-white">Support</p>
                         </div>
@@ -632,10 +601,8 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
                                 </svg>
                                 <p class="text-white">Billing</p>
                             </div>
@@ -678,15 +645,14 @@
                     </div>
                     {% endif %}
 
+
                     <!-- UTILITIES -->
                     <div class="w-full menu-container">
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
                                 </svg>
                                 <p class="text-white">Utilities</p>
                             </div>
@@ -745,10 +711,8 @@
 
                     <a class="w-full">
                         <div class="w-full flex justify-start items-center gap-3 border-b border-slate-600 py-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
                             </svg>
                             <p class="text-white">Activity</p>
                         </div>
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-312.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-312.pyc
index 739879e3..9e67bd11 100644
Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-312.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-312.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-312.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-312.pyc
index a7f0ce10..f811d030 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-312.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-312.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-312.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-312.pyc
index 061f9585..7e699a68 100644
Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-312.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-312.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-312.pyc
index b1899c8d..9effce32 100644
Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-312.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-312.pyc differ
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index e1ba3132..63fa68be 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -758,6 +758,10 @@ video {
   bottom: 1.25rem;
 }
 
+.bottom-\[-35px\] {
+  bottom: -35px;
+}
+
 .left-0 {
   left: 0px;
 }
@@ -766,6 +770,10 @@ video {
   left: 0.25rem;
 }
 
+.left-1\/2 {
+  left: 50%;
+}
+
 .left-10 {
   left: 2.5rem;
 }
@@ -1440,6 +1448,11 @@ video {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
+.-translate-x-1\/2 {
+  --tw-translate-x: -50%;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+}
+
 .-translate-y-1 {
   --tw-translate-y: -0.25rem;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
@@ -1629,6 +1642,19 @@ video {
   gap: 2rem;
 }
 
+.gap-x-5 {
+  -moz-column-gap: 1.25rem;
+       column-gap: 1.25rem;
+}
+
+.gap-y-10 {
+  row-gap: 2.5rem;
+}
+
+.gap-y-14 {
+  row-gap: 3.5rem;
+}
+
 .gap-y-2 {
   row-gap: 0.5rem;
 }
@@ -3215,11 +3241,6 @@ video {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-.hover\:bg-gray-100:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(243 244 246 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-gray-50:hover {
   --tw-bg-opacity: 1;
   background-color: rgb(249 250 251 / var(--tw-bg-opacity));
@@ -3257,11 +3278,6 @@ video {
   color: rgb(146 156 183 / var(--tw-text-opacity));
 }
 
-.hover\:text-gray-200:hover {
-  --tw-text-opacity: 1;
-  color: rgb(229 231 235 / var(--tw-text-opacity));
-}
-
 .hover\:text-gray-500:hover {
   --tw-text-opacity: 1;
   color: rgb(107 114 128 / var(--tw-text-opacity));
diff --git a/osinaweb/static/images/icons/invoice.png b/osinaweb/static/images/icons/invoice.png
new file mode 100644
index 00000000..1fbfcac7
Binary files /dev/null and b/osinaweb/static/images/icons/invoice.png differ
diff --git a/osinaweb/static/js/customer_dashboard/tickets-filtering.js b/osinaweb/static/js/customer_dashboard/tickets-filtering.js
new file mode 100644
index 00000000..56537dd5
--- /dev/null
+++ b/osinaweb/static/js/customer_dashboard/tickets-filtering.js
@@ -0,0 +1,28 @@
+function showOpenTickets() {
+    openTicketsContainer.classList.remove('hidden');
+    closedTicketsContainer.classList.add('hidden');
+    openTicketsLink.classList.add('text-secondosiblue', 'font-semibold');
+    closedTicketsLink.classList.remove('text-secondosiblue', 'font-semibold');
+    closedTicketsLink.classList.add('text-gray-500');
+}
+
+
+function showClosedTickets() {
+    openTicketsContainer.classList.add('hidden');
+    closedTicketsContainer.classList.remove('hidden');
+    closedTicketsLink.classList.add('text-secondosiblue', 'font-semibold');
+    openTicketsLink.classList.remove('text-secondosiblue', 'font-semibold');
+    openTicketsLink.classList.add('text-gray-500');
+}
+
+const openTicketsLink = document.getElementById('openTicketsLink');
+const closedTicketsLink = document.getElementById('closedTicketsLink');
+const openTicketsContainer = document.getElementById('openTickets');
+const closedTicketsContainer = document.getElementById('closedTickets');
+
+
+openTicketsLink.addEventListener('click', showOpenTickets);
+closedTicketsLink.addEventListener('click', showClosedTickets);
+
+
+showOpenTickets();
\ No newline at end of file
diff --git a/osinaweb/static/js/side-bar.js b/osinaweb/static/js/side-bar.js
index 8b32b2ec..b5d5b9f3 100644
--- a/osinaweb/static/js/side-bar.js
+++ b/osinaweb/static/js/side-bar.js
@@ -72,8 +72,8 @@ document.addEventListener('DOMContentLoaded', function () {
     // TO DISPLAY THE USER PROFILE DROPDOWN ON MOBILE
     const mobileUserProfile = document.getElementById('mobileUserProfile');
     var dropdown = document.getElementById('mobileUserProfileDropdown');
-    var arrowDown = this.querySelector('.fa-angle-down');
-    var arrowUp = this.querySelector('.fa-angle-up');
+    var arrowDown = menuItem.querySelector('.angleDown');
+    var arrowUp = menuItem.querySelector('.angleUp');
 
     mobileUserProfile.addEventListener('click', function () {
         dropdown.classList.toggle('active');