diff --git a/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc b/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc
index 6bca19e6..79ff18af 100644
Binary files a/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc b/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc
index 204cd281..70bdc13e 100644
Binary files a/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc b/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc
index 90c3e9c1..8fbcb770 100644
Binary files a/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/models.cpython-310.pyc b/osinaweb/addressbook/__pycache__/models.cpython-310.pyc
index faa45009..adcae185 100644
Binary files a/osinaweb/addressbook/__pycache__/models.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc
index 3e159576..95bdfddf 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc
index 7d3fc0a3..40b19074 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc
index 30a8baf4..4acd1785 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc
index e2c0cfc7..bdcfa45b 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc
index 87e54fce..55139b6e 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc
index 8ab55647..0fe37ad8 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/__init__.cpython-310.pyc b/osinaweb/billing/__pycache__/__init__.cpython-310.pyc
index c6dd011e..07b120df 100644
Binary files a/osinaweb/billing/__pycache__/__init__.cpython-310.pyc and b/osinaweb/billing/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/admin.cpython-310.pyc b/osinaweb/billing/__pycache__/admin.cpython-310.pyc
index 17270d1f..b5a42549 100644
Binary files a/osinaweb/billing/__pycache__/admin.cpython-310.pyc and b/osinaweb/billing/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/apps.cpython-310.pyc b/osinaweb/billing/__pycache__/apps.cpython-310.pyc
index e320ac39..de527058 100644
Binary files a/osinaweb/billing/__pycache__/apps.cpython-310.pyc and b/osinaweb/billing/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc
index 4e0036be..4df26da6 100644
Binary files a/osinaweb/billing/__pycache__/models.cpython-310.pyc and b/osinaweb/billing/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/__pycache__/urls.cpython-310.pyc
index 338c4e52..b7d04c5d 100644
Binary files a/osinaweb/billing/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/views.cpython-310.pyc b/osinaweb/billing/__pycache__/views.cpython-310.pyc
index f57ba1f5..9de881c6 100644
Binary files a/osinaweb/billing/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc
index 733f78a2..4bd59fcf 100644
Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc
index 5fdb78a0..43311365 100644
Binary files a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc
index dfd28cf4..9453eb1e 100644
Binary files a/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc b/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc
index ad3a9214..4b159391 100644
Binary files a/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc
index 1187cf72..f6807d8e 100644
Binary files a/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc b/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc
index a7117cc9..e0c2fb55 100644
Binary files a/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc
index 46a60494..1c101be8 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc
index 010805b5..6bfb2e89 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc
index 15a4fdb5..2f256fd2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc
index 32617e1f..114be70a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc
index 72bf68a0..b4985051 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc
index fe528292..16553bf2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc
index 627bf24f..4bf698b7 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc
index 3cc7be29..dc4918e0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc
index dca56e48..a1960d90 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc
index 1f927bf1..0d54ddef 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc
index 6e632f6a..bb185b5e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc
index e6a90cee..44c7f8ae 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc
index 843f8bc2..db345978 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc
index 0090e47b..41f261b4 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc
index e59d9cef..1280e11c 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc
index cd9c8987..f37ae3bc 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc
index 425a7afc..fc4fdf28 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc
index 8f3d4641..260e6842 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc
index c4f95abc..49ba9879 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc
index 311fab04..7d3f6d18 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc
index a8e033f6..174f359f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc
index 7f0b5455..845dce3e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc
index 92c37316..40edb19a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc
index b9f33cf6..9dcd8e11 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc
index e351711e..bb8e8a8d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc
index 7b3b24cf..10d1582a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc
index 76953405..bbad5773 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc
index 6d514c77..20ba2f6f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc
index 891f25bc..59199c8b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc
index 771f3655..ec7ffc50 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc
index a05f7f57..23db89b8 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc
index 635bd942..97f2277d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc
index d045a14a..a6b05e71 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc
index 34f07623..03532565 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc
index 3322d032..9e62ad52 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc
index fe1c7b6e..3c002ce7 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc
index ab526d1d..52436175 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc
index ec82dbdf..c1cf6034 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc
index 31e8c48f..d72d611e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc
index 04ab457e..bc50e168 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc
index 10ddaaae..30dce91d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc
index 781f6268..d8d66739 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc
index d0036925..854ccb02 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc
index 4bdee9c5..f742011a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc
index 212c8f95..b293cf3d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc
index c9e31d0d..8f36463d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc
index 82d4aae7..119f2e2b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc
index 3e56c094..12cfc8d6 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc
index 7de13ff3..ca3d0065 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc
index 760adcd9..f1bfbc25 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc
index 8b9aa261..98016199 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc
index 4c7b8391..893f638c 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc
index 9c5d9b0d..0e9c8e74 100644
Binary files a/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc b/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc
index 0425019a..e8663a65 100644
Binary files a/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc and b/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/admin.cpython-310.pyc b/osinaweb/customercore/__pycache__/admin.cpython-310.pyc
index 4d0e37e5..5ec92342 100644
Binary files a/osinaweb/customercore/__pycache__/admin.cpython-310.pyc and b/osinaweb/customercore/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/apps.cpython-310.pyc b/osinaweb/customercore/__pycache__/apps.cpython-310.pyc
index 3421eecc..c6726b79 100644
Binary files a/osinaweb/customercore/__pycache__/apps.cpython-310.pyc and b/osinaweb/customercore/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc
index eed29c08..b1b7ae8e 100644
Binary files a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc b/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc
index 349b3dbf..578772d7 100644
Binary files a/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc and b/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/models.cpython-310.pyc b/osinaweb/customercore/__pycache__/models.cpython-310.pyc
index 5164ce21..815ec65b 100644
Binary files a/osinaweb/customercore/__pycache__/models.cpython-310.pyc and b/osinaweb/customercore/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/__pycache__/urls.cpython-310.pyc
index 21d7fc83..64efb367 100644
Binary files a/osinaweb/customercore/__pycache__/urls.cpython-310.pyc and b/osinaweb/customercore/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index 8ad04fad..b9dffc11 100644
Binary files a/osinaweb/customercore/__pycache__/views.cpython-310.pyc and b/osinaweb/customercore/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/customercore/add/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/add/__pycache__/urls.cpython-310.pyc
index e77cb26f..d90d5977 100644
Binary files a/osinaweb/customercore/add/__pycache__/urls.cpython-310.pyc and b/osinaweb/customercore/add/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/customercore/add/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/add/__pycache__/views.cpython-310.pyc
index 30bc984e..b4921e33 100644
Binary files a/osinaweb/customercore/add/__pycache__/views.cpython-310.pyc and b/osinaweb/customercore/add/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc
index 1bb67ab3..da0341e3 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc
index 2edcb308..62bbd82a 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc
index a4b6a275..3ac309ea 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc
index d6874412..57d92d9c 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc
index 30f1f3ea..0c3b8f27 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc
index 19e37e94..b35cb649 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc
index 26191262..b07a03d1 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc
index bdc91e39..f336d87c 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc
index 3bb33a27..4b4b0391 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc
index aac7b434..1fc3e195 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc
index 9b362f2e..13aa9bdf 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0012_ticket_ticket_members.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0012_ticket_ticket_members.cpython-310.pyc
index 4c80a68f..53f5533c 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0012_ticket_ticket_members.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0012_ticket_ticket_members.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0013_alter_ticket_ticket_members.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0013_alter_ticket_ticket_members.cpython-310.pyc
index ab5c9358..c7d690e3 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0013_alter_ticket_ticket_members.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0013_alter_ticket_ticket_members.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0014_remove_ticket_department_ticket_department.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0014_remove_ticket_department_ticket_department.cpython-310.pyc
index b57439c5..c23c5c91 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0014_remove_ticket_department_ticket_department.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0014_remove_ticket_department_ticket_department.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0015_rename_department_ticket_departments.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0015_rename_department_ticket_departments.cpython-310.pyc
index 3353ccb3..c1b6dfef 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0015_rename_department_ticket_departments.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0015_rename_department_ticket_departments.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0016_rename_ticketstatusupdate_ticketstatus.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0016_rename_ticketstatusupdate_ticketstatus.cpython-310.pyc
index 5792d04c..d63a42e8 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0016_rename_ticketstatusupdate_ticketstatus.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0016_rename_ticketstatusupdate_ticketstatus.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0017_tickettask.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0017_tickettask.cpython-310.pyc
index b4bae20e..2eeac82a 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0017_tickettask.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0017_tickettask.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0018_alter_ticketattachment_file.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0018_alter_ticketattachment_file.cpython-310.pyc
index ec677b7b..be61a3e3 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0018_alter_ticketattachment_file.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0018_alter_ticketattachment_file.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0019_file.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0019_file.cpython-310.pyc
index 4a7b5c67..5b271149 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0019_file.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0019_file.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0020_alter_ticketattachment_file.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0020_alter_ticketattachment_file.cpython-310.pyc
index abf396e8..2dfa8883 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0020_alter_ticketattachment_file.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0020_alter_ticketattachment_file.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0021_file_ticket.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0021_file_ticket.cpython-310.pyc
index a81b4d9f..d70bc979 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0021_file_ticket.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0021_file_ticket.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0022_remove_file_ticket.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0022_remove_file_ticket.cpython-310.pyc
index 9fd13e08..e157931e 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0022_remove_file_ticket.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0022_remove_file_ticket.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0023_delete_file_remove_ticketattachment_file_and_more.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0023_delete_file_remove_ticketattachment_file_and_more.cpython-310.pyc
index ab17be9f..5feee7f9 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0023_delete_file_remove_ticketattachment_file_and_more.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0023_delete_file_remove_ticketattachment_file_and_more.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc
index dd2978f5..976b9358 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc
index 8226d6f9..b5cb6097 100644
Binary files a/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc and b/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc
index b74488a2..4854e272 100644
Binary files a/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc and b/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/customercore/templates/contact.html b/osinaweb/customercore/templates/contact.html
index 8b1d4cc5..ea8a0e3f 100644
--- a/osinaweb/customercore/templates/contact.html
+++ b/osinaweb/customercore/templates/contact.html
@@ -3,9 +3,11 @@
 {% block content %}
 
 <div class="w-full px-5 s:px-9 flex flex-col gap-5">
-    <div class="w-full bg-white rounded-md h-fit shadow-md p-5 flex justify-center items-center text-center"> 
+
+
+    <!--<div class="w-full bg-white rounded-md h-fit shadow-md p-5 flex justify-center items-center text-center"> 
         <p class="text-secondosiblue font-poppinsBold text-xl s:text-2xl">Ositcom Support is Availale 24h a Day on Whatsapp <a href="https://wa.me/96171918718" target="_blank" class="cursor-pointer hover:text-gray-400 duration-300">+961 71 918 718</a></p>
-    </div>
+    </div>-->
 
     <div class="w-full bg-white rounded-md h-fit shadow-md p-5">
         <div class="w-full grid grid-cols-1 md:grid-cols-2 gap-5">
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index bdf4c667..f216c1f1 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc
index e70515cf..86577dca 100644
Binary files a/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc
index ef6eb67e..b56bd461 100644
Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc b/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc
index 4270e91f..bfe3faf2 100644
Binary files a/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc
index 7ebf5704..335b3d6f 100644
Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc b/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc
index 1487e757..ecf2161f 100644
Binary files a/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc
index f691bd80..c3ff4600 100644
Binary files a/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc
index 8e46df6a..1138dba7 100644
Binary files a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc
index c9075a3b..82c037ce 100644
Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index 3fa16334..219f0c54 100644
Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc
index 914e2655..cdc960a1 100644
Binary files a/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc
index c62aa33f..217897db 100644
Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc
index ceea47c4..4996f234 100644
Binary files a/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc
index ad57eff9..729d15fb 100644
Binary files a/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc
index 2bbf1954..655326ce 100644
Binary files a/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc
index 9c744695..f7d40e48 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc
index 6bfe7dab..a287d5ec 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc
index 23440bff..685b3278 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc
index 561a3fe4..1bf8c049 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-310.pyc
index 53464361..b2b544bd 100644
Binary files a/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/knowledge_base/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-310.pyc
index 37b69a69..0293a962 100644
Binary files a/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/knowledge_base/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc
index 114e09e6..22250afb 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc
index 81b84c4b..c4b154aa 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc
index 23a1dbfa..cf80d727 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc
index 12648ef3..acd2418a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc
index bf21b9d3..1556fb77 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc
index 6d81b61f..6cdd10dc 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc
index 955d3f3c..2ea8a5f3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc
index f02a3be7..52cc2786 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc
index 6648061d..30e15ad6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc
index d895e043..9fe80c6e 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc
index 54aa4d92..461f7bd9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc
index cfca9ee1..89890bc7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc
index e4647c27..577ec447 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc
index 682b88ed..f773cc53 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc
index 2149b428..cacbd76c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc
index dea425c0..26f308b7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc
index b9704db8..41410727 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc
index b2436d4f..7e16098b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc
index a4020fa3..8172ed36 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc
index a56582b1..cd723cac 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc
index 0328a216..9c82ff35 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc
index e93de1cd..a3ffa90d 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc
index 4f4dfb66..948142ed 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc
index e4046b81..6102275b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc
index bc8957b8..8582d3e9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc
index a51bcd4d..82428174 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc
index 9e42da6a..93ee0962 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc
index e47aeb48..f4421b25 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc
index 950141c8..7a5cac00 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc
index 457f632f..39d836d1 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc
index 627d6df0..6c0367ef 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc
index 3d37ae9e..7524a514 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc
index 73e51003..fc833870 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc
index 1b0ae51b..c6d7e182 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc
index 89d55324..9331ef58 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc
index d7fc6837..06947ce2 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc
index 83340c83..37d86505 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc
index 59170b42..97eae2bd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc
index a5575630..9a386f75 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc
index 8428b84b..d7ff8904 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc
index 0f37fca2..faedd21b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc
index b9c3eeca..9d252188 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc
index e386e8ff..a87db79b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc
index 3a421237..1c540742 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc
index 4e8fe8c7..9f386a2a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc
index 0ce12d53..758e52af 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc
index cac95f5b..2911a2cd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc
index ca270780..1392fd5f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc
index 1b4b68c4..ed312b41 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc
index 9aa64baa..44051bf4 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc
index 146df1a9..a25bfc38 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc
index c7751418..f6057462 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc
index 3de7c8b3..e005201a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc
index 7e1063aa..fe24146c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc
index e62272e1..711af776 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc
index 7b3d150d..5d1a436e 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc
index 8072760d..78e633fd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc
index f8d0fd7f..8d2c9980 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc
index c7c49535..f7487668 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc
index 618a5c49..47dcfbc3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc
index bc31c454..e72b1930 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc
index 5d208a43..8ae42a2e 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc
index 8645fefa..8392250a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc
index 8746b210..069bf13b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc
index 5e921053..9c7364b6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc
index 6278d7fb..3c7cf6b3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc
index a4d3443d..dca288b8 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc
index 4ce1aa40..d813efa9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc
index 59109fd2..02f9c0c2 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc
index 2a83563b..e3a3727b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc
index 48a32ac8..c29967d3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc
index 87d1efdf..0761a92d 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc
index bedf935e..a8824ef2 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc
index b004a8f1..fe807894 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc
index b9432a3c..31ce3f0a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc
index f52d29fc..42defd1f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc
index 6cf2e802..e0c24262 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc
index a36ed4b6..3bcf5fce 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc
index ec4a8e81..2bc1ff34 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-310.pyc
index 3c433f9a..3468ba03 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0081_status_task.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0081_status_task.cpython-310.pyc
index b1ebca10..02419549 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0081_status_task.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0081_status_task.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0082_pinnedproject.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0082_pinnedproject.cpython-310.pyc
index 66b640a1..94602cd7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0082_pinnedproject.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0082_pinnedproject.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc
index de4d14c4..de1ffbb6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc
index 12d92ce0..e81bd3df 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc
index b9d56b76..3f1c0372 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0085_rename_date_staffposition_start_date_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc
index ddab35a2..53ef2e40 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py
index 669da195..2599f2cd 100644
--- a/osinaweb/osinacore/models.py
+++ b/osinaweb/osinacore/models.py
@@ -7,6 +7,7 @@ from django.utils import timezone
 from django.db.models import Sum, F
 from datetime import timedelta
 
+
 # Create your models here.
 
 class Reference(models.Model):
@@ -191,6 +192,7 @@ class Project(models.Model):
 
 
 
+
 class ProjectStatus(models.Model):
     STATUS_CHOICES = (
         ('In Progress', 'In Progress'),
@@ -204,6 +206,11 @@ class ProjectStatus(models.Model):
 
 
 
+class PinnedProject(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+
+
 class PinnedProject(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     project = models.ForeignKey(Project, on_delete=models.CASCADE)
diff --git a/osinaweb/osinacore/templates/index.html b/osinaweb/osinacore/templates/index.html
index 20f37577..730cc790 100644
--- a/osinaweb/osinacore/templates/index.html
+++ b/osinaweb/osinacore/templates/index.html
@@ -4,106 +4,7 @@
 
 <!-- LEFT SIDE -->
 <div class="w-full xxlg1:w-[75%] flex flex-col gap-5">
-    <!-- PINNED PROJECTS -->
-    {% if pinned_projects_with_time %}
-        <div class="w-full grid grid-cols-1 md:grid-cols-2 gap-5">
-            {% for pinned in pinned_projects_with_time %}
-            <a href="{% url 'detailed-project' pinned.project.project_id %}">
-                <div class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
-                    <div class="w-full bg-white h-fit rounded-md border border-gray-200">
-                        <div
-                            class="w-full px-5 pt-4 pb-1 flex flex-col gap-1 justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px] bg-opacity-70 relative 
-                            {% if pinned.project.projectstatus_set.all.last.status == 'Completed' %}bg-green-700{% endif %}
-                            {% if pinned.project.projectstatus_set.all.last.status == 'Cancelled' %}bg-red-500{% endif %}
-                            {% if pinned.project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %}
-                            {% if pinned.project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %}">
-                            <p>{{pinned.project.name}}</p>
-                            <p id="projectId" class="hidden">{{pinned.project.id}}</p>
-
-                            <div class="w-full flex justify-between items-center gap-3 text-white text-[12px] opacity-80">
-                                <p class="startDate">{{ pinned.project.start_date|date:'Y-m-d' }}</p>
-                                <p class="endDate">{{ pinned.project.end_date|date:'Y-m-d' }}</p>
-                            </div>
-
-                            <div class="absolute top-3 right-3 cursor-pointer z-20" id="unpinProject">
-                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white"
-                                    color="#000000" fill="none">
-                                    <path
-                                        d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
-                                        stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
-                                        stroke-linejoin="round" />
-                                    <path
-                                        d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
-                                        stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
-                                        stroke-linejoin="round" />
-                                    <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
-                                        stroke-linejoin="round" />
-                                    <path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
-                                        stroke-linejoin="round" />
-                                </svg>
-                            </div>
-
-                        </div>
-
-                        <!-- Progress Bar -->
-                        <div class="w-full h-[8px] bg-gray-100 mainBar">
-                            <div class="h-full progressBar">
-                            </div>
-                        </div>
-
-                        <div class="w-full flex flex-col justify-between">
-                            <!-- Details -->
-                            <div class="w-full flex flex-col gap-3 p-5">
-                                <div class="w-full flex justify-start items-center gap-2">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                        stroke="currentColor" class="w-6 h-6 text-secondosiblue">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                            d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
-                                    </svg>
-
-                                    <p class="text-secondosiblue"><span
-                                            class="font-poppinsBold">{{pinned.open_tasks}}</span> Open
-                                        {% if pinned.project.open_tasks == 1 %} Task {% else %} Tasks {% endif %}</p>
-                                </div>
-
-                                <div class="w-full flex justify-start items-center gap-2">
-                                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"
-                                        class="w-6 h-6 text-secondosiblue" color="#000000" fill="none">
-                                        <path
-                                            d="M2.46433 9.34375C2.21579 9.34375 1.98899 9.14229 2.00041 8.87895C2.06733 7.33687 2.25481 6.33298 2.78008 5.53884C3.08228 5.08196 3.45765 4.68459 3.88923 4.36468C5.05575 3.5 6.70139 3.5 9.99266 3.5H14.0074C17.2986 3.5 18.9443 3.5 20.1108 4.36468C20.5424 4.68459 20.9177 5.08196 21.2199 5.53884C21.7452 6.33289 21.9327 7.33665 21.9996 8.87843C22.011 9.14208 21.7839 9.34375 21.5351 9.34375C20.1493 9.34375 19.0259 10.533 19.0259 12C19.0259 13.467 20.1493 14.6562 21.5351 14.6562C21.7839 14.6562 22.011 14.8579 21.9996 15.1216C21.9327 16.6634 21.7452 17.6671 21.2199 18.4612C20.9177 18.918 20.5424 19.3154 20.1108 19.6353C18.9443 20.5 17.2986 20.5 14.0074 20.5H9.99266C6.70139 20.5 5.05575 20.5 3.88923 19.6353C3.45765 19.3154 3.08228 18.918 2.78008 18.4612C2.25481 17.667 2.06733 16.6631 2.00041 15.1211C1.98899 14.8577 2.21579 14.6562 2.46433 14.6562C3.85012 14.6562 4.97352 13.467 4.97352 12C4.97352 10.533 3.85012 9.34375 2.46433 9.34375Z"
-                                            stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" />
-                                        <path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
-                                            stroke-linejoin="round" />
-                                    </svg>
-                                    <p class="text-secondosiblue"><span
-                                            class="font-poppinsBold">{{pinned.project.ticket_set.all.count}}</span> Open
-                                        {% if pinned.project.ticket_set.all.count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
-                                </div>
-
-
 
-                                <div class="w-full flex justify-start items-center gap-2">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                        stroke="currentColor" class="w-6 h-6 text-secondosiblue">
-                                        <path stroke-linecap="round" stroke-linejoin="round"
-                                            d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
-                                    </svg>
-
-                                    <p class="text-secondosiblue">Total Time: <span
-                                            class="font-poppinsBold">{{pinned.total_time_worked.hours}}hr
-                                            {{pinned.total_time_worked.minutes}}min
-                                            {{pinned.total_time_worked.seconds}}sec</span>
-                                    </p>
-                                </div>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </a>
-            {% endfor %}
-        </div>
-    {% endif %}
 
 
     <!-- TICKETS -->
diff --git a/osinaweb/osinacore/templates/listing_pages/projects.html b/osinaweb/osinacore/templates/listing_pages/projects.html
index 245e21cb..5bc389fa 100644
--- a/osinaweb/osinacore/templates/listing_pages/projects.html
+++ b/osinaweb/osinacore/templates/listing_pages/projects.html
@@ -71,8 +71,145 @@
     </div>
 
 
-    <!-- IN PROGRESS PROJECTS -->
+
     <div class="w-full flex flex-col gap-5 mt-3" id="inProgressProjectsContainer">
+        {% for project in latest_pinned_projects %} 
+        <div
+            class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
+            <p id="projectId" class="hidden">{{project.id}}</p>
+
+            <div class="w-full bg-white h-fit rounded-md border border-gray-200">
+                <a href="{% url 'detailed-project' project.project_id %}">
+                    <div class="w-full px-5 pt-4 pb-1 flex flex-col gap-1 justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px] bg-opacity-70 hover:bg-opacity-100 duration-300 relative {% if project.projectstatus_set.all.last.status == 'Completed' %}bg-green-700{% endif %} {% if project.projectstatus_set.all.last.status == 'Cancelled' %}bg-red-500{% endif %} {% if project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %} {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %} ">
+                        <p>{{project.name}}</p>
+
+                        <div class="w-full flex justify-between items-center gap-3 text-white text-[12px] opacity-80">
+                            <p class="startDate">{{project.start_date}}</p>
+                            <p class="endDate">{{project.end_date}}</p>
+                        </div>
+
+                        <div class="absolute top-3 right-3 cursor-pointer" id="pinProject">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white"
+                            color="#000000" fill="none">
+                            <path
+                                d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
+                                stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            <path
+                                d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
+                                stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                            <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                stroke-linejoin="round" />
+                            <path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                stroke-linejoin="round" />
+                            </svg>
+                        </div>
+                
+                        <div class="absolute top-3 right-3 cursor-pointer hidden" id="unpinProject">
+                            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white"
+                                color="#000000" fill="none">
+                                <path
+                                    d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
+                                    stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                                <path
+                                    d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
+                                    stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                                <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round" />
+                                <path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                                    stroke-linejoin="round" />
+                            </svg>
+                        </div>
+                    </div>
+                </a>
+
+
+
+                <!-- Progress Bar -->
+                <div class="w-full h-[8px] bg-gray-100 mainBar">
+                    <div class="h-full progressBar">
+                    </div>
+                </div>
+
+
+
+                <div class="w-full grid grid-cols-1 l:grid-cols-2">
+                    <!-- Left Section -->
+                    <div class="flex flex-col justify-between">
+                        <!-- Details -->
+                        <div class="w-full flex flex-col gap-3 p-5">
+                            <div class="w-full flex justify-start items-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
+                                </svg>
+
+                                <p class="text-secondosiblue"><span
+                                        class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open {% if project.open_user_tasks_count == 1 %} Task {% else %} Tasks {% endif %}</p>
+                            </div>
+
+                            <div class="w-full flex justify-start items-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 h-6 text-secondosiblue" color="#000000" fill="none">
+                                    <path d="M2.46433 9.34375C2.21579 9.34375 1.98899 9.14229 2.00041 8.87895C2.06733 7.33687 2.25481 6.33298 2.78008 5.53884C3.08228 5.08196 3.45765 4.68459 3.88923 4.36468C5.05575 3.5 6.70139 3.5 9.99266 3.5H14.0074C17.2986 3.5 18.9443 3.5 20.1108 4.36468C20.5424 4.68459 20.9177 5.08196 21.2199 5.53884C21.7452 6.33289 21.9327 7.33665 21.9996 8.87843C22.011 9.14208 21.7839 9.34375 21.5351 9.34375C20.1493 9.34375 19.0259 10.533 19.0259 12C19.0259 13.467 20.1493 14.6562 21.5351 14.6562C21.7839 14.6562 22.011 14.8579 21.9996 15.1216C21.9327 16.6634 21.7452 17.6671 21.2199 18.4612C20.9177 18.918 20.5424 19.3154 20.1108 19.6353C18.9443 20.5 17.2986 20.5 14.0074 20.5H9.99266C6.70139 20.5 5.05575 20.5 3.88923 19.6353C3.45765 19.3154 3.08228 18.918 2.78008 18.4612C2.25481 17.667 2.06733 16.6631 2.00041 15.1211C1.98899 14.8577 2.21579 14.6562 2.46433 14.6562C3.85012 14.6562 4.97352 13.467 4.97352 12C4.97352 10.533 3.85012 9.34375 2.46433 9.34375Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" />
+                                    <path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                                </svg>
+                                <p class="text-secondosiblue"><span
+                                        class="font-poppinsBold">{{project.open_tickets_count}}</span> Open {% if project.open_tickets_count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
+                            </div>
+
+
+
+                            <div class="w-full flex justify-start items-center gap-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                                </svg>
+
+                                <p class="text-secondosiblue">Total Time: <span
+                                        class="font-poppinsBold">{{project.total_time_worked_hours}}hr
+                                        {{project.total_time_worked_minutes}}min
+                                        {{project.total_time_worked_seconds}}sec</span>
+                                </p>
+                            </div>
+
+                        </div>
+                    </div>
+
+                    <!-- Right Section - Recent Notes -->
+                    <div class="w-full border-l-none l:border-l border-gray-200">
+                        {% if project.note_set.exists %}
+                        {% with last_note=project.note_set.last %}
+                        <div class="w-full h-full flex flex-col gap-3 justify-center items-center p-3">
+                            <p class="text-gray-400 break-all whitespace-pre-wrap text-sm">{{ last_note.text }}</p>
+                            <div class="w-[30px] h-[30px] rounded-full shadow-md p-1 flex justify-center items-center bg-gray-100 cursor-pointer hover:scale-105 duration-300 addProjectNoteButton"
+                                data-modal-url="{% url 'addprojectnotemodal' project.project_id %}">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="3"
+                                    stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                                </svg>
+                            </div>
+                        </div>
+                        {% endwith %}
+                        {% else %}
+                        <div class="w-full h-full flex flex-col justify-center items-center gap-3 p-3">
+                            <p class="text-secondosiblue">No Recent Note</p>
+                            <div class="w-[30px] h-[30px] rounded-full shadow-md p-1 flex justify-center items-center bg-gray-100 cursor-pointer hover:scale-105 duration-300 addProjectNoteButton"
+                                data-modal-url="{% url 'addprojectnotemodal' project.project_id %}">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="3"
+                                    stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                                </svg>
+                            </div>
+                        </div>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+
+
         {% for project in in_progress_projects %} 
         <div
             class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
@@ -149,7 +286,7 @@
                                     <path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
                                 </svg>
                                 <p class="text-secondosiblue"><span
-                                        class="font-poppinsBold">{{project.ticket_set.all.count}}</span> Open {% if project.ticket_set.all.count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
+                                        class="font-poppinsBold">{{project.open_tickets_count}}</span> Open {% if project.open_tickets_count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
                             </div>
 
 
diff --git a/osinaweb/osinacore/templates/projects-by-status.html b/osinaweb/osinacore/templates/projects-by-status.html
index 9115b1a2..b7cac4ca 100644
--- a/osinaweb/osinacore/templates/projects-by-status.html
+++ b/osinaweb/osinacore/templates/projects-by-status.html
@@ -1,4 +1,139 @@
 {% load static %}
+{% for project in latest_pinned_projects %} 
+<div
+    class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
+    <p id="projectId" class="hidden">{{project.id}}</p>
+
+    <div class="w-full bg-white h-fit rounded-md border border-gray-200">
+        <a href="{% url 'detailed-project' project.project_id %}">
+            <div class="w-full px-5 pt-4 pb-1 flex flex-col gap-1 justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px] bg-opacity-70 hover:bg-opacity-100 duration-300 relative {% if project.projectstatus_set.all.last.status == 'Completed' %}bg-green-700{% endif %} {% if project.projectstatus_set.all.last.status == 'Cancelled' %}bg-red-500{% endif %} {% if project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %} {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %} ">
+                <p>{{project.name}}</p>
+
+                <div class="w-full flex justify-between items-center gap-3 text-white text-[12px] opacity-80">
+                    <p class="startDate">{{project.start_date}}</p>
+                    <p class="endDate">{{project.end_date}}</p>
+                </div>
+
+                <div class="absolute top-3 right-3 cursor-pointer" id="pinProject">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5  text-white"
+                        color="#000000" fill="none">
+                        <path
+                            d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
+                            stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        <path
+                            d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
+                            stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                            stroke-linejoin="round" />
+                        <path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                            stroke-linejoin="round" />
+                    </svg>
+                </div>
+        
+                <div class="absolute top-3 right-3 cursor-pointer hidden" id="unpinProject">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-5 h-5 text-white"
+                        color="#000000" fill="none">
+                        <path
+                            d="M7.5 8C6.95863 8.1281 6.49932 8.14239 5.99268 8.45891C5.07234 9.03388 4.85108 9.71674 5.08821 10.7612C5.94028 14.5139 9.48599 18.0596 13.2388 18.9117C14.2834 19.1489 14.9661 18.928 15.5416 18.0077C15.8411 17.5288 15.8716 17.0081 16 16.5"
+                            stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        <path
+                            d="M12 7.79915C12.1776 7.77794 12.3182 7.74034 12.4295 7.68235C13.3997 7.17686 13.9291 5.53361 14.4498 4.60009C14.9311 3.73715 15.1718 3.30567 15.7379 3.10227C16.3041 2.89888 16.6448 3.02205 17.3262 3.26839C18.9197 3.8445 20.1555 5.08032 20.7316 6.6738C20.9779 7.35521 21.1011 7.69591 20.8977 8.26204C20.6943 8.82817 20.2628 9.06884 19.3999 9.55018C18.4608 10.074 16.7954 10.6108 16.2905 11.5898C16.2345 11.6983 16.1978 11.8327 16.1769 12"
+                            stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        <path d="M3 21L8 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                            stroke-linejoin="round" />
+                        <path d="M3 3L21 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"
+                            stroke-linejoin="round" />
+                    </svg>
+                </div>
+            </div>
+        </a>
+
+
+
+        <!-- Progress Bar -->
+        <div class="w-full h-[8px] bg-gray-100 mainBar">
+            <div class="h-full progressBar">
+            </div>
+        </div>
+
+
+
+        <div class="w-full grid grid-cols-1 l:grid-cols-2">
+            <!-- Left Section -->
+            <div class="flex flex-col justify-between">
+                <!-- Details -->
+                <div class="w-full flex flex-col gap-3 p-5">
+                    <div class="w-full flex justify-start items-center gap-2">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
+                        </svg>
+
+                        <p class="text-secondosiblue"><span
+                                class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open {% if project.open_user_tasks_count == 1 %} Task {% else %} Tasks {% endif %}</p>
+                    </div>
+
+                    <div class="w-full flex justify-start items-center gap-2">
+                        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" class="w-6 h-6 text-secondosiblue" color="#000000" fill="none">
+                            <path d="M2.46433 9.34375C2.21579 9.34375 1.98899 9.14229 2.00041 8.87895C2.06733 7.33687 2.25481 6.33298 2.78008 5.53884C3.08228 5.08196 3.45765 4.68459 3.88923 4.36468C5.05575 3.5 6.70139 3.5 9.99266 3.5H14.0074C17.2986 3.5 18.9443 3.5 20.1108 4.36468C20.5424 4.68459 20.9177 5.08196 21.2199 5.53884C21.7452 6.33289 21.9327 7.33665 21.9996 8.87843C22.011 9.14208 21.7839 9.34375 21.5351 9.34375C20.1493 9.34375 19.0259 10.533 19.0259 12C19.0259 13.467 20.1493 14.6562 21.5351 14.6562C21.7839 14.6562 22.011 14.8579 21.9996 15.1216C21.9327 16.6634 21.7452 17.6671 21.2199 18.4612C20.9177 18.918 20.5424 19.3154 20.1108 19.6353C18.9443 20.5 17.2986 20.5 14.0074 20.5H9.99266C6.70139 20.5 5.05575 20.5 3.88923 19.6353C3.45765 19.3154 3.08228 18.918 2.78008 18.4612C2.25481 17.667 2.06733 16.6631 2.00041 15.1211C1.98899 14.8577 2.21579 14.6562 2.46433 14.6562C3.85012 14.6562 4.97352 13.467 4.97352 12C4.97352 10.533 3.85012 9.34375 2.46433 9.34375Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round" />
+                            <path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+                        </svg>
+                        <p class="text-secondosiblue"><span
+                                class="font-poppinsBold">{{project.open_tickets_count}}</span> Open {% if project.open_tickets_count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
+                    </div>
+
+
+
+                    <div class="w-full flex justify-start items-center gap-2">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                        </svg>
+
+                        <p class="text-secondosiblue">Total Time: <span
+                                class="font-poppinsBold">{{project.total_time_worked_hours}}hr
+                                {{project.total_time_worked_minutes}}min
+                                {{project.total_time_worked_seconds}}sec</span>
+                        </p>
+                    </div>
+
+                </div>
+            </div>
+
+            <!-- Right Section - Recent Notes -->
+            <div class="w-full border-l-none l:border-l border-gray-200">
+                {% if project.note_set.exists %}
+                {% with last_note=project.note_set.last %}
+                <div class="w-full h-full flex flex-col gap-3 justify-center items-center p-3">
+                    <p class="text-gray-400 break-all whitespace-pre-wrap text-sm">{{ last_note.text }}</p>
+                    <div class="w-[30px] h-[30px] rounded-full shadow-md p-1 flex justify-center items-center bg-gray-100 cursor-pointer hover:scale-105 duration-300 addProjectNoteButton"
+                        data-modal-url="{% url 'addprojectnotemodal' project.project_id %}">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="3"
+                            stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                        </svg>
+                    </div>
+                </div>
+                {% endwith %}
+                {% else %}
+                <div class="w-full h-full flex flex-col justify-center items-center gap-3 p-3">
+                    <p class="text-secondosiblue">No Recent Note</p>
+                    <div class="w-[30px] h-[30px] rounded-full shadow-md p-1 flex justify-center items-center bg-gray-100 cursor-pointer hover:scale-105 duration-300 addProjectNoteButton"
+                        data-modal-url="{% url 'addprojectnotemodal' project.project_id %}">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="3"
+                            stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                        </svg>
+                    </div>
+                </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
+{% endfor %}
 
 {% for project in filtered_projects %}
 <div class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
@@ -77,7 +212,7 @@
                             <path d="M9 3.5L9 20.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
                         </svg>
                         <p class="text-secondosiblue"><span
-                                class="font-poppinsBold">{{project.ticket_set.all.count}}</span> Open {% if project.ticket_set.all.count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
+                                class="font-poppinsBold">{{project.open_tickets_count}}</span> Open {% if project.open_tickets_count == 1 %} Ticket {% else %} Tickets {% endif %}</p>
                     </div>
 
                     <div class="w-full flex justify-start items-center gap-2">
diff --git a/osinaweb/osinacore/templates/recent-activities-page.html b/osinaweb/osinacore/templates/recent-activities-page.html
index 8f3f475a..536b58dd 100644
--- a/osinaweb/osinacore/templates/recent-activities-page.html
+++ b/osinaweb/osinacore/templates/recent-activities-page.html
@@ -255,10 +255,10 @@
                             </a>
 
 
-                            <a href="{% url 'staffpositions' %}">
+                            <a href="{% url 'jobpositions' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                    <p class="text-white">Staff Positions</p>
+                                    <p class="text-white">Job Positions</p>
                                 </div>
                             </a>
 
@@ -557,10 +557,10 @@
                             </a>
 
 
-                            <a href="{% url 'staffpositions' %}">
+                            <a href="{% url 'jobpositions' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                    <p class="text-white">Staff Positions</p>
+                                    <p class="text-white">Job Positions</p>
                                 </div>
                             </a>
 
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 69f83e34..0a80fe87 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -185,20 +185,11 @@ def home(request, *args, **kwargs):
             tasks = Task.objects.filter(Q(assigned_to=request.user.staffprofile) & (Q(status='Open') | Q(status='Working On'))).order_by('-status_date', '-id')
 
 
-        pinned_projects = PinnedProject.objects.filter(user=request.user).order_by('-id')[:3]
-        pinned_projects_with_time = []
-        for pinned_project in pinned_projects:
-            project = pinned_project.project
-            total_time_worked = project.total_time_worked(request.user)
-            open_tasks = project.open_tasks_count(request.user)
-            pinned_projects_with_time.append({'project': project, 'total_time_worked': total_time_worked, 'open_tasks': open_tasks})
-
         
         context = {
             'notes': notes,
             'recent_note': recent_note,
             'tasks': tasks,
-            'pinned_projects_with_time': pinned_projects_with_time,
         }
         return render(request, 'index.html', context)
 
@@ -293,51 +284,44 @@ def my_projects(request, *args, **kwargs):
     user = request.user
 
     if user.is_superuser:
-        # Superadmin can see all projects with total time worked on each project
         projects = Project.objects.all().order_by('-project_id')
     else:
-        # Non-superuser, filter projects where the user is either the manager or a member
-        projects = Project.objects.filter(
-            Q(manager=user.staffprofile) | Q(members=user.staffprofile)
-        ).distinct().order_by('-project_id')
+        projects = Project.objects.filter( Q(manager=user.staffprofile) | Q(members=user.staffprofile)).distinct().order_by('-project_id')
 
-    # Fetch projects with their last status as "In Progress"
     in_progress_projects = []
     for project in projects:
         last_status = ProjectStatus.objects.filter(project = project).last()
         if last_status.status == 'In Progress':
             in_progress_projects.append(project)
 
-    for project in in_progress_projects:
-        total_time_seconds = 0
-        # Modify task queryset based on user role
-        if user.is_superuser:
-            tasks = project.task_set.all()
-        else:
-            tasks = project.task_set.filter(assigned_to=user.staffprofile)
-
-        for task in tasks:
-            total_time_hours, total_time_minutes, total_time_seconds_task = task.total_task_time()
-            total_time_seconds += (total_time_hours * 3600) + (total_time_minutes * 60) + total_time_seconds_task
+    
+    latest_pinned = PinnedProject.objects.filter(user=request.user)[:4]
+    latest_pinned_project_ids = [pinned.project.id for pinned in latest_pinned]
+    latest_pinned_projects = [pinned.project for pinned in latest_pinned]
+    for project in latest_pinned_projects:
+        total_time = project.total_time_worked(request.user)
+        project.total_time_worked_hours = total_time['hours']
+        project.total_time_worked_minutes = total_time['minutes']
+        project.total_time_worked_seconds = total_time['seconds']
 
-        total_time_hours = total_time_seconds // 3600
-        total_time_minutes = (total_time_seconds % 3600) // 60
-        total_time_seconds = total_time_seconds % 60
+        project.open_user_tasks_count = project.open_tasks_count(request.user)
+        project.open_tickets_count = Ticket.objects.filter(project=project).exclude(status='Closed').count()
 
-        project.total_time_worked_hours = total_time_hours
-        project.total_time_worked_minutes = total_time_minutes
-        project.total_time_worked_seconds = total_time_seconds
 
-        if user.is_superuser:
-            open_user_tasks_count = Task.objects.filter(project=project).exclude(status='Closed').count()
-        else:
-            open_user_tasks_count = Task.objects.filter(project=project, assigned_to=user.staffprofile).exclude(status='Closed').count()
+    in_progress_projects = [project for project in in_progress_projects if project.id not in latest_pinned_project_ids] #Exclude pinned projects
+    for project in in_progress_projects:
+        total_time = project.total_time_worked(request.user)
+        project.total_time_worked_hours = total_time['hours']
+        project.total_time_worked_minutes = total_time['minutes']
+        project.total_time_worked_seconds = total_time['seconds']
 
-        project.open_user_tasks_count = open_user_tasks_count
+        project.open_user_tasks_count = project.open_tasks_count(request.user)
+        project.open_tickets_count = Ticket.objects.filter(project=project).exclude(status='Closed').count()
 
     context = {
         'projects': projects,
-        'in_progress_projects': in_progress_projects,  # Add in-progress projects to context
+        'in_progress_projects': in_progress_projects, 
+        'latest_pinned_projects': latest_pinned_projects,
     }
     return render(request, 'listing_pages/projects.html', context)
 
@@ -925,15 +909,11 @@ def fetch_projects_by_status(request, status=None):
     user = request.user
 
     if user.is_superuser:
-        # Superadmin can see all projects with total time worked on each project
         projects = Project.objects.all().order_by('-project_id')
     else:
-        # Non-superuser, filter projects where the user is either the manager or a member
-        projects = Project.objects.filter(
-            Q(manager=user.staffprofile) | Q(members=user.staffprofile)
-        ).distinct().order_by('-project_id')
+        projects = Project.objects.filter( Q(manager=user.staffprofile) | Q(members=user.staffprofile)).distinct().order_by('-project_id')
+
 
-    # Fetch projects with their last status as "In Progress"
     if status:
         filtered_projects = []
         for project in projects:
@@ -942,34 +922,33 @@ def fetch_projects_by_status(request, status=None):
                 filtered_projects.append(project)
     else:
         filtered_projects = projects
-        
-    for project in projects:
-        total_time_seconds = 0
-        open_user_tasks_count = 0
 
-        # Modify task queryset based on user role
-        if request.user.is_superuser:
-            tasks = project.task_set.all()
-            open_user_tasks_count = Task.objects.filter(project=project).exclude(status='Closed').count()
-        else:
-            tasks = project.task_set.filter(assigned_to=request.user.staffprofile)
-            open_user_tasks_count = Task.objects.filter(project=project, assigned_to=request.user.staffprofile).exclude(status='Closed').count()
+    
+    latest_pinned = PinnedProject.objects.filter(user=request.user)[:4]
+    latest_pinned_project_ids = [pinned.project.id for pinned in latest_pinned]
+    latest_pinned_projects = [pinned.project for pinned in latest_pinned]
+    for project in latest_pinned_projects:
+        total_time = project.total_time_worked(request.user)
+        project.total_time_worked_hours = total_time['hours']
+        project.total_time_worked_minutes = total_time['minutes']
+        project.total_time_worked_seconds = total_time['seconds']
 
-        for task in tasks:
-            total_time_hours, total_time_minutes, total_time_seconds_task = task.total_task_time()
-            total_time_seconds += (total_time_hours * 3600) + (total_time_minutes * 60) + total_time_seconds_task
+        project.open_user_tasks_count = project.open_tasks_count(request.user)
 
-        total_time_hours = total_time_seconds // 3600
-        total_time_minutes = (total_time_seconds % 3600) // 60
-        total_time_seconds = total_time_seconds % 60
 
-        project.total_time_worked_hours = total_time_hours
-        project.total_time_worked_minutes = total_time_minutes
-        project.total_time_worked_seconds = total_time_seconds
-        project.open_user_tasks_count = open_user_tasks_count
+    
+    filtered_projects = [project for project in filtered_projects if project.id not in latest_pinned_project_ids] #Exclude pinned projects
+    for project in filtered_projects:
+        total_time = project.total_time_worked(request.user)
+        project.total_time_worked_hours = total_time['hours']
+        project.total_time_worked_minutes = total_time['minutes']
+        project.total_time_worked_seconds = total_time['seconds']
+
+        project.open_user_tasks_count = project.open_tasks_count(request.user)
 
     context = {
         'filtered_projects': filtered_projects,
+        'latest_pinned_projects': latest_pinned_projects,
         'status': status,
     }
     return render(request, 'projects-by-status.html', context)
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc
index 17d6b1f9..b306a29f 100644
Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
index 9df999f7..973a59ec 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc
index d6c529c3..abcd84ed 100644
Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc
index 52162ca2..94cbf177 100644
Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc differ