diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo
index ce001a6..5a80b35 100644
Binary files a/locale/ar/LC_MESSAGES/django.mo and b/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po
index 5276b50..6f30fed 100644
--- a/locale/ar/LC_MESSAGES/django.po
+++ b/locale/ar/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PX360 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-05 14:56+0300\n"
+"POT-Creation-Date: 2026-01-05 16:59+0300\n"
 "PO-Revision-Date: 2025-12-15 12:30+0300\n"
 "Last-Translator: PX360 Team\n"
 "Language-Team: Arabic\n"
@@ -24,7 +24,7 @@ msgstr "المعلومات الشخصية"
 #: apps/accounts/admin.py:22 templates/callcenter/complaint_form.html:128
 #: templates/callcenter/inquiry_form.html:132
 #: templates/complaints/complaint_form.html:76
-#: templates/complaints/inquiry_detail.html:139
+#: templates/complaints/inquiry_form.html:53
 msgid "Organization"
 msgstr "المنظمة"
 
@@ -80,6 +80,7 @@ msgstr "العودة إلى الإجراءات"
 #: templates/actions/action_detail.html:227
 #: templates/appreciation/appreciation_detail.html:12
 #: templates/complaints/complaint_detail.html:181
+#: templates/complaints/inquiry_detail.html:179
 #: templates/observations/observation_detail.html:199
 msgid "Details"
 msgstr "التفاصيل"
@@ -106,11 +107,13 @@ msgstr "يتطلب الموافقة"
 
 #: templates/actions/action_detail.html:496
 #: templates/complaints/complaint_detail.html:440
+#: templates/complaints/inquiry_detail.html:390
 msgid "Quick Actions"
 msgstr "إجراءات سريعة"
 
 #: templates/actions/action_detail.html:502
 #: templates/complaints/complaint_detail.html:446
+#: templates/complaints/inquiry_detail.html:396
 #: templates/config/routing_rules.html:33
 #: templates/feedback/feedback_detail.html:475
 #: templates/observations/observation_detail.html:398
@@ -119,6 +122,7 @@ msgstr "تعيين إلى"
 
 #: templates/actions/action_detail.html:522
 #: templates/complaints/complaint_detail.html:466
+#: templates/complaints/inquiry_detail.html:416
 #: templates/feedback/feedback_detail.html:455
 #: templates/observations/observation_detail.html:454
 msgid "Change Status"
@@ -126,12 +130,15 @@ msgstr "تغيير الحالة"
 
 #: templates/actions/action_detail.html:531
 #: templates/complaints/complaint_detail.html:475
+#: templates/complaints/inquiry_detail.html:425
 msgid "Optional note..."
 msgstr "ملاحظة اختيارية..."
 
 #: templates/actions/action_detail.html:549
 #: templates/complaints/complaint_detail.html:493
 #: templates/complaints/complaint_detail.html:501
+#: templates/complaints/inquiry_detail.html:437
+#: templates/complaints/inquiry_detail.html:445
 #: templates/observations/observation_detail.html:420
 #: templates/observations/observation_detail.html:433
 msgid "Add Note"
@@ -139,11 +146,13 @@ msgstr "إضافة ملاحظة"
 
 #: templates/actions/action_detail.html:555
 #: templates/complaints/complaint_detail.html:499
+#: templates/complaints/inquiry_detail.html:443
 msgid "Enter your note..."
 msgstr "أدخل ملاحظتك..."
 
 #: templates/actions/action_detail.html:566
 #: templates/complaints/complaint_detail.html:510
+#: templates/complaints/inquiry_detail.html:527
 msgid "Assignment Info"
 msgstr "معلومات التعيين"
 
@@ -174,14 +183,13 @@ msgstr "اشرح سبب الحاجة إلى تصعيد هذا الإجراء..."
 #: templates/callcenter/inquiry_form.html:233
 #: templates/complaints/complaint_detail.html:607
 #: templates/complaints/complaint_form.html:222
-#: templates/complaints/inquiry_form.html:108
+#: templates/complaints/inquiry_form.html:237
 #: templates/observations/category_form.html:91
 #: templates/observations/convert_to_action.html:91
 msgid "Cancel"
 msgstr "إلغاء"
 
 #: templates/actions/action_list.html:139
-#: templates/complaints/inquiry_list.html:26
 #: templates/observations/observation_list.html:113
 msgid "Total"
 msgstr "الإجمالي"
@@ -193,10 +201,7 @@ msgstr "الإجمالي"
 #: templates/callcenter/inquiry_list.html:103
 #: templates/complaints/analytics.html:51
 #: templates/complaints/complaint_list.html:122
-#: templates/complaints/inquiry_detail.html:38
-#: templates/complaints/inquiry_list.html:34
-#: templates/complaints/inquiry_list.html:72
-#: templates/complaints/inquiry_list.html:143
+#: templates/complaints/inquiry_list.html:119
 msgid "Open"
 msgstr "مفتوح"
 
@@ -206,10 +211,7 @@ msgstr "مفتوح"
 #: templates/callcenter/inquiry_list.html:70
 #: templates/callcenter/inquiry_list.html:104
 #: templates/complaints/complaint_list.html:137
-#: templates/complaints/inquiry_detail.html:40
-#: templates/complaints/inquiry_list.html:42
-#: templates/complaints/inquiry_list.html:73
-#: templates/complaints/inquiry_list.html:145
+#: templates/complaints/inquiry_list.html:134
 #: templates/observations/observation_list.html:143
 #: templates/observations/public_track.html:316
 msgid "In Progress"
@@ -237,7 +239,7 @@ msgstr "إجراءاتي"
 #: templates/callcenter/inquiry_form.html:89
 #: templates/callcenter/inquiry_list.html:94
 #: templates/complaints/complaint_list.html:180
-#: templates/complaints/inquiry_list.html:65
+#: templates/complaints/inquiry_list.html:177
 #: templates/feedback/feedback_list.html:191
 #: templates/journeys/instance_list.html:127
 #: templates/observations/observation_list.html:186
@@ -259,9 +261,8 @@ msgstr "العنوان، الوصف..."
 #: templates/complaints/complaint_detail.html:564
 #: templates/complaints/complaint_list.html:188
 #: templates/complaints/complaint_list.html:340
-#: templates/complaints/inquiry_detail.html:36
-#: templates/complaints/inquiry_list.html:69
-#: templates/complaints/inquiry_list.html:120
+#: templates/complaints/inquiry_list.html:185
+#: templates/complaints/inquiry_list.html:304
 #: templates/config/routing_rules.html:34 templates/config/sla_config.html:35
 #: templates/dashboard/command_center.html:241
 #: templates/feedback/feedback_list.html:212
@@ -311,6 +312,9 @@ msgstr "الخطورة"
 #: templates/complaints/complaint_detail.html:230
 #: templates/complaints/complaint_form.html:173
 #: templates/complaints/complaint_list.html:213
+#: templates/complaints/inquiry_form.html:161
+#: templates/complaints/inquiry_list.html:198
+#: templates/complaints/inquiry_list.html:305
 #: templates/config/routing_rules.html:28
 #: templates/feedback/feedback_form.html:230
 #: templates/observations/convert_to_action.html:71
@@ -330,10 +334,10 @@ msgstr "الأولوية"
 #: templates/complaints/complaint_form.html:128
 #: templates/complaints/complaint_list.html:225
 #: templates/complaints/complaint_list.html:339
-#: templates/complaints/inquiry_detail.html:51
-#: templates/complaints/inquiry_form.html:86
-#: templates/complaints/inquiry_list.html:79
-#: templates/complaints/inquiry_list.html:119
+#: templates/complaints/inquiry_detail.html:206
+#: templates/complaints/inquiry_form.html:124
+#: templates/complaints/inquiry_list.html:210
+#: templates/complaints/inquiry_list.html:303
 #: templates/feedback/feedback_form.html:192
 #: templates/feedback/feedback_list.html:225
 #: templates/feedback/feedback_list.html:323
@@ -351,6 +355,8 @@ msgstr "الفئة"
 #: templates/actions/action_list.html:431
 #: templates/complaints/complaint_detail.html:223
 #: templates/complaints/complaint_form.html:184
+#: templates/complaints/inquiry_detail.html:212
+#: templates/complaints/inquiry_form.html:172
 #: templates/dashboard/command_center.html:238
 msgid "Source"
 msgstr "المصدر"
@@ -370,10 +376,10 @@ msgstr "المصدر"
 #: templates/complaints/complaint_form.html:81
 #: templates/complaints/complaint_list.html:240
 #: templates/complaints/complaint_list.html:342
-#: templates/complaints/inquiry_detail.html:142
-#: templates/complaints/inquiry_form.html:33
-#: templates/complaints/inquiry_list.html:90
-#: templates/complaints/inquiry_list.html:121
+#: templates/complaints/inquiry_detail.html:141
+#: templates/complaints/inquiry_form.html:58
+#: templates/complaints/inquiry_list.html:226
+#: templates/complaints/inquiry_list.html:306
 #: templates/config/routing_rules.html:32 templates/config/sla_config.html:29
 #: templates/feedback/feedback_form.html:247
 #: templates/feedback/feedback_list.html:249
@@ -407,7 +413,7 @@ msgstr "المستشفى"
 #: templates/complaints/complaint_form.html:91
 #: templates/complaints/complaint_list.html:253
 #: templates/complaints/inquiry_detail.html:145
-#: templates/complaints/inquiry_form.html:44
+#: templates/complaints/inquiry_form.html:68
 #: templates/dashboard/command_center.html:146
 #: templates/feedback/feedback_form.html:256
 #: templates/journeys/instance_list.html:166
@@ -433,7 +439,10 @@ msgstr "القسم"
 #: templates/complaints/complaint_detail.html:514
 #: templates/complaints/complaint_list.html:266
 #: templates/complaints/complaint_list.html:343
-#: templates/complaints/inquiry_detail.html:149
+#: templates/complaints/inquiry_detail.html:235
+#: templates/complaints/inquiry_detail.html:531
+#: templates/complaints/inquiry_list.html:239
+#: templates/complaints/inquiry_list.html:307
 #: templates/observations/observation_detail.html:367
 #: templates/observations/observation_list.html:245
 #: templates/observations/observation_list.html:313
@@ -442,6 +451,7 @@ msgstr "تم الإسناد إلى"
 
 #: templates/actions/action_list.html:381
 #: templates/complaints/complaint_list.html:288
+#: templates/complaints/inquiry_list.html:252
 #: templates/feedback/feedback_list.html:274
 #: templates/journeys/instance_list.html:178
 #: templates/observations/observation_list.html:268
@@ -450,6 +460,7 @@ msgstr "من التاريخ"
 
 #: templates/actions/action_list.html:385
 #: templates/complaints/complaint_list.html:292
+#: templates/complaints/inquiry_list.html:256
 #: templates/feedback/feedback_list.html:278
 #: templates/journeys/instance_list.html:182
 #: templates/observations/observation_list.html:272
@@ -463,7 +474,8 @@ msgstr "إلى التاريخ"
 #: templates/complaints/analytics.html:178
 #: templates/complaints/complaint_detail.html:138
 #: templates/complaints/complaint_list.html:336
-#: templates/complaints/inquiry_list.html:116
+#: templates/complaints/inquiry_detail.html:128
+#: templates/complaints/inquiry_list.html:300
 #: templates/feedback/feedback_list.html:319
 msgid "ID"
 msgstr "المعرف"
@@ -483,6 +495,9 @@ msgstr "العنوان"
 #: templates/actions/action_list.html:437
 #: templates/complaints/analytics.html:182
 #: templates/complaints/complaint_list.html:344
+#: templates/complaints/inquiry_detail.html:154
+#: templates/complaints/inquiry_form.html:206
+#: templates/complaints/inquiry_list.html:308
 msgid "Due Date"
 msgstr "تاريخ الاستحقاق"
 
@@ -492,8 +507,8 @@ msgstr "تاريخ الاستحقاق"
 #: templates/callcenter/inquiry_list.html:156
 #: templates/complaints/complaint_detail.html:288
 #: templates/complaints/complaint_list.html:345
-#: templates/complaints/inquiry_detail.html:55
-#: templates/complaints/inquiry_list.html:122
+#: templates/complaints/inquiry_detail.html:275
+#: templates/complaints/inquiry_list.html:309
 #: templates/feedback/feedback_list.html:328
 msgid "Created"
 msgstr "تاريخ الإنشاء"
@@ -508,7 +523,7 @@ msgstr "تاريخ الإنشاء"
 #: templates/callcenter/interaction_list.html:61
 #: templates/complaints/analytics.html:184
 #: templates/complaints/complaint_list.html:346
-#: templates/complaints/inquiry_list.html:123
+#: templates/complaints/inquiry_list.html:310
 #: templates/feedback/feedback_list.html:329
 #: templates/journeys/instance_list.html:213
 #: templates/journeys/template_list.html:30
@@ -530,6 +545,7 @@ msgstr "الإجراءات"
 #: templates/appreciation/appreciation_list.html:160
 #: templates/complaints/complaint_detail.html:416
 #: templates/complaints/complaint_list.html:405
+#: templates/complaints/inquiry_list.html:382
 #: templates/feedback/feedback_list.html:400
 #: templates/observations/observation_list.html:376
 msgid "View"
@@ -551,8 +567,6 @@ msgstr "قم بإجراء تحليل للمشاعر على أي نص"
 #: templates/appreciation/appreciation_detail.html:105
 #: templates/callcenter/complaint_form.html:65
 #: templates/callcenter/inquiry_form.html:61
-#: templates/complaints/inquiry_detail.html:16
-#: templates/complaints/inquiry_form.html:16
 #: templates/observations/observation_detail.html:178
 msgid "Back to List"
 msgstr "العودة إلى القائمة"
@@ -837,7 +851,7 @@ msgstr "إجمالي النتائج"
 
 #: templates/ai_engine/sentiment_list.html:69
 #: templates/complaints/complaint_list.html:168
-#: templates/complaints/inquiry_list.html:60
+#: templates/complaints/inquiry_list.html:165
 #: templates/observations/observation_list.html:174
 msgid "Filters"
 msgstr "عوامل التصفية"
@@ -845,14 +859,15 @@ msgstr "عوامل التصفية"
 #: templates/ai_engine/sentiment_list.html:96
 #: templates/appreciation/leaderboard.html:75
 #: templates/complaints/complaint_list.html:299
+#: templates/complaints/inquiry_list.html:263
 #: templates/observations/observation_list.html:279
 msgid "Apply Filters"
 msgstr "تطبيق الفلاتر"
 
 #: templates/ai_engine/sentiment_list.html:99
 #: templates/complaints/complaint_list.html:302
-#: templates/complaints/inquiry_form.html:209
-#: templates/complaints/inquiry_list.html:100
+#: templates/complaints/inquiry_form.html:325
+#: templates/complaints/inquiry_list.html:266
 #: templates/observations/observation_list.html:282
 #: templates/physicians/leaderboard.html:116
 #: templates/physicians/physician_list.html:97
@@ -887,7 +902,6 @@ msgstr "الأول"
 #: templates/appreciation/my_badges.html:107
 #: templates/callcenter/complaint_list.html:226
 #: templates/callcenter/inquiry_list.html:218
-#: templates/complaints/inquiry_list.html:175
 msgid "Previous"
 msgstr "السابق"
 
@@ -915,7 +929,6 @@ msgstr "من"
 #: templates/appreciation/my_badges.html:131
 #: templates/callcenter/complaint_list.html:240
 #: templates/callcenter/inquiry_list.html:232
-#: templates/complaints/inquiry_list.html:187
 msgid "Next"
 msgstr "التالي"
 
@@ -943,7 +956,7 @@ msgid "Total Actions"
 msgstr "إجمالي الإجراءات"
 
 #: templates/analytics/kpi_list.html:25
-#: templates/complaints/inquiry_detail.html:122
+#: templates/complaints/inquiry_detail.html:502
 #: templates/config/routing_rules.html:29 templates/config/sla_config.html:28
 #: templates/journeys/template_list.html:25
 #: templates/observations/observation_detail.html:261
@@ -1131,6 +1144,7 @@ msgstr "جميع الحالات"
 
 #: templates/appreciation/appreciation_list.html:184
 #: templates/complaints/complaint_list.html:227
+#: templates/complaints/inquiry_list.html:212
 #: templates/observations/observation_list.html:221
 msgid "All Categories"
 msgstr "جميع الفئات"
@@ -1182,7 +1196,6 @@ msgid "Physician"
 msgstr "طبيب"
 
 #: templates/appreciation/appreciation_send_form.html:46
-#: templates/complaints/inquiry_form.html:35
 msgid "Select Hospital"
 msgstr "اختر المستشفى"
 
@@ -1200,9 +1213,6 @@ msgid "Select a hospital first"
 msgstr "يرجى اختيار المستشفى أولًا"
 
 #: templates/appreciation/appreciation_send_form.html:69
-#: templates/complaints/inquiry_form.html:46
-#: templates/complaints/inquiry_form.html:140
-#: templates/complaints/inquiry_form.html:147
 msgid "Select Department"
 msgstr "اختر القسم"
 
@@ -1211,7 +1221,6 @@ msgid "Optional: Select if related to a specific department"
 msgstr "اختياري: اختر إذا كان مرتبطًا بقسم معين"
 
 #: templates/appreciation/appreciation_send_form.html:78
-#: templates/complaints/inquiry_form.html:88
 msgid "Select Category"
 msgstr "اختر الفئة"
 
@@ -1713,6 +1722,7 @@ msgstr "إنشاء شكوى"
 #: templates/callcenter/inquiry_list.html:5
 #: templates/callcenter/inquiry_success.html:5
 #: templates/complaints/complaint_form.html:192
+#: templates/complaints/inquiry_form.html:183
 #: templates/layouts/partials/sidebar.html:184
 msgid "Call Center"
 msgstr "مركز الاتصال"
@@ -1755,6 +1765,7 @@ msgstr "رقم هاتف المتصل"
 
 #: templates/callcenter/complaint_form.html:111
 #: templates/callcenter/inquiry_form.html:107
+#: templates/complaints/inquiry_form.html:107
 msgid "Phone number"
 msgstr "رقم الهاتف"
 
@@ -1771,8 +1782,10 @@ msgstr "العلاقة"
 #: templates/complaints/complaint_form.html:58
 #: templates/complaints/complaint_form.html:187
 #: templates/complaints/complaint_list.html:337
-#: templates/complaints/inquiry_detail.html:109
-#: templates/complaints/inquiry_form.html:52
+#: templates/complaints/inquiry_detail.html:132
+#: templates/complaints/inquiry_detail.html:478
+#: templates/complaints/inquiry_form.html:84
+#: templates/complaints/inquiry_form.html:175
 #: templates/feedback/feedback_form.html:115
 #: templates/journeys/instance_list.html:207
 #: templates/surveys/instance_list.html:62
@@ -1782,6 +1795,7 @@ msgstr "المريض"
 #: templates/callcenter/complaint_form.html:118
 #: templates/callcenter/inquiry_form.html:122
 #: templates/complaints/complaint_form.html:188
+#: templates/complaints/inquiry_form.html:176
 msgid "Family Member"
 msgstr "أحد أفراد العائلة"
 
@@ -1793,8 +1807,10 @@ msgstr "أحد أفراد العائلة"
 #: templates/complaints/complaint_form.html:137
 #: templates/complaints/complaint_form.html:195
 #: templates/complaints/complaint_list.html:234
-#: templates/complaints/inquiry_form.html:93
-#: templates/complaints/inquiry_list.html:86
+#: templates/complaints/inquiry_form.html:134
+#: templates/complaints/inquiry_form.html:184
+#: templates/complaints/inquiry_form.html:199
+#: templates/complaints/inquiry_list.html:220
 msgid "Other"
 msgstr "أخرى"
 
@@ -1894,8 +1910,8 @@ msgstr "مدة الانتظار"
 #: templates/callcenter/inquiry_list.html:115
 #: templates/complaints/complaint_form.html:135
 #: templates/complaints/complaint_list.html:232
-#: templates/complaints/inquiry_form.html:90
-#: templates/complaints/inquiry_list.html:83
+#: templates/complaints/inquiry_form.html:128
+#: templates/complaints/inquiry_list.html:214
 msgid "Billing"
 msgstr "الفوترة"
 
@@ -1918,6 +1934,7 @@ msgstr "فئة فرعية اختيارية"
 
 #: templates/callcenter/complaint_form.html:213
 #: templates/complaints/complaint_form.html:155
+#: templates/complaints/inquiry_form.html:157
 msgid "Classification"
 msgstr "التصنيف"
 
@@ -1933,6 +1950,8 @@ msgstr "اختر درجة الخطورة..."
 #: templates/complaints/complaint_form.html:212
 #: templates/complaints/complaint_list.html:204
 #: templates/complaints/complaint_list.html:216
+#: templates/complaints/inquiry_form.html:164
+#: templates/complaints/inquiry_list.html:201
 #: templates/observations/observation_list.html:210
 #: templates/observations/public_new.html:250
 msgid "Low"
@@ -1946,6 +1965,8 @@ msgstr "منخفض"
 #: templates/complaints/complaint_form.html:211
 #: templates/complaints/complaint_list.html:205
 #: templates/complaints/complaint_list.html:217
+#: templates/complaints/inquiry_form.html:165
+#: templates/complaints/inquiry_list.html:202
 #: templates/observations/observation_list.html:211
 #: templates/observations/public_new.html:256
 msgid "Medium"
@@ -1959,6 +1980,8 @@ msgstr "متوسط"
 #: templates/complaints/complaint_form.html:210
 #: templates/complaints/complaint_list.html:206
 #: templates/complaints/complaint_list.html:218
+#: templates/complaints/inquiry_form.html:166
+#: templates/complaints/inquiry_list.html:203
 #: templates/observations/observation_list.html:212
 #: templates/observations/public_new.html:262
 msgid "High"
@@ -1986,6 +2009,8 @@ msgstr "اختر الأولوية..."
 #: templates/callcenter/complaint_form.html:237
 #: templates/complaints/complaint_form.html:179
 #: templates/complaints/complaint_list.html:219
+#: templates/complaints/inquiry_form.html:167
+#: templates/complaints/inquiry_list.html:204
 msgid "Urgent"
 msgstr "عاجل"
 
@@ -2079,10 +2104,7 @@ msgstr "الشكاوى المُقدمة عبر مركز الاتصال"
 #: templates/callcenter/inquiry_list.html:105
 #: templates/complaints/analytics.html:67
 #: templates/complaints/analytics.html:147
-#: templates/complaints/inquiry_detail.html:42
-#: templates/complaints/inquiry_list.html:50
-#: templates/complaints/inquiry_list.html:74
-#: templates/complaints/inquiry_list.html:147
+#: templates/complaints/inquiry_list.html:149
 #: templates/observations/public_track.html:323
 msgid "Resolved"
 msgstr "تم الحل"
@@ -2100,16 +2122,12 @@ msgstr "بحث..."
 #: templates/callcenter/inquiry_list.html:113
 #: templates/callcenter/inquiry_list.html:125
 #: templates/complaints/complaint_list.html:281
-#: templates/complaints/inquiry_list.html:71
-#: templates/complaints/inquiry_list.html:81
-#: templates/complaints/inquiry_list.html:92
 #: templates/observations/observation_list.html:260
 msgid "All"
 msgstr "الكل"
 
 #: templates/callcenter/complaint_list.html:110
 #: templates/callcenter/inquiry_list.html:106
-#: templates/complaints/inquiry_list.html:75
 #: templates/observations/public_track.html:330
 msgid "Closed"
 msgstr "مغلقة"
@@ -2127,6 +2145,9 @@ msgstr "تصفية"
 #: templates/callcenter/complaint_list.html:178
 #: templates/callcenter/complaint_success.html:83
 #: templates/complaints/complaint_detail.html:241
+#: templates/complaints/inquiry_detail.html:217
+#: templates/complaints/inquiry_detail.html:230
+#: templates/complaints/inquiry_detail.html:537
 msgid "N/A"
 msgstr "غير متاح"
 
@@ -2222,7 +2243,7 @@ msgstr "عرض جميع الشكاوى"
 #: templates/callcenter/inquiry_form.html:56
 #: templates/callcenter/inquiry_form.html:230
 #: templates/callcenter/inquiry_list.html:36
-#: templates/complaints/inquiry_form.html:110
+#: templates/complaints/inquiry_form.html:234
 #: templates/layouts/partials/sidebar.html:207
 msgid "Create Inquiry"
 msgstr "إنشاء استفسار"
@@ -2236,66 +2257,68 @@ msgid "Search for an existing patient or enter contact details manually"
 msgstr "ابحث عن مريض موجود أو أدخل تفاصيل الاتصال يدويًا"
 
 #: templates/callcenter/inquiry_form.html:99
-#: templates/complaints/inquiry_form.html:65
+#: templates/complaints/inquiry_form.html:98
 #: templates/feedback/feedback_form.html:128
 msgid "Contact Name"
 msgstr "اسم جهة الاتصال"
 
 #: templates/callcenter/inquiry_form.html:105
-#: templates/complaints/inquiry_form.html:71
+#: templates/complaints/inquiry_form.html:105
 msgid "Contact Phone"
 msgstr "هاتف جهة الاتصال"
 
 #: templates/callcenter/inquiry_form.html:111
-#: templates/complaints/inquiry_form.html:75
+#: templates/complaints/inquiry_form.html:110
 msgid "Contact Email"
 msgstr "البريد الإلكتروني لجهة الاتصال"
 
 #: templates/callcenter/inquiry_form.html:113
+#: templates/complaints/inquiry_form.html:112
 msgid "Email address"
 msgstr "عنوان البريد الإلكتروني"
 
 #: templates/callcenter/inquiry_form.html:158
 #: templates/callcenter/inquiry_success.html:60
-#: templates/complaints/inquiry_form.html:83
+#: templates/complaints/inquiry_detail.html:202
+#: templates/complaints/inquiry_form.html:120
 msgid "Inquiry Details"
 msgstr "تفاصيل الاستفسار"
 
 #: templates/callcenter/inquiry_form.html:165
 #: templates/callcenter/inquiry_list.html:114
-#: templates/complaints/inquiry_form.html:89
-#: templates/complaints/inquiry_list.html:82
+#: templates/complaints/inquiry_form.html:127
+#: templates/complaints/inquiry_list.html:213
 msgid "Appointment"
 msgstr "موعد"
 
 #: templates/callcenter/inquiry_form.html:167
 #: templates/callcenter/inquiry_list.html:116
-#: templates/complaints/inquiry_form.html:91
-#: templates/complaints/inquiry_list.html:84
+#: templates/complaints/inquiry_form.html:129
+#: templates/complaints/inquiry_list.html:215
 msgid "Medical Records"
 msgstr "السجلات الطبية"
 
 #: templates/callcenter/inquiry_form.html:168
-#: templates/complaints/inquiry_form.html:92
+#: templates/complaints/inquiry_form.html:133
 msgid "General Information"
 msgstr "معلومات عامة"
 
 #: templates/callcenter/inquiry_form.html:174
 #: templates/callcenter/inquiry_list.html:151
 #: templates/callcenter/interaction_list.html:55
-#: templates/complaints/inquiry_detail.html:32
-#: templates/complaints/inquiry_form.html:98
-#: templates/complaints/inquiry_list.html:117
+#: templates/complaints/inquiry_form.html:139
+#: templates/complaints/inquiry_list.html:301
 msgid "Subject"
 msgstr "الموضوع"
 
 #: templates/callcenter/inquiry_form.html:176
+#: templates/complaints/inquiry_form.html:141
 msgid "Brief summary of the inquiry"
 msgstr "ملخص موجز للاستفسار"
 
 #: templates/callcenter/inquiry_form.html:180
-#: templates/complaints/inquiry_detail.html:61
-#: templates/complaints/inquiry_form.html:103
+#: templates/complaints/inquiry_detail.html:249
+#: templates/complaints/inquiry_form.html:145
 #: templates/feedback/feedback_form.html:181
 msgid "Message"
 msgstr "الرسالة"
@@ -2373,8 +2396,6 @@ msgid "No patients found. Please enter contact details manually."
 msgstr "لم يتم العثور على أي مرضى. يرجى إدخال بيانات الاتصال يدويًا."
 
 #: templates/callcenter/inquiry_list.html:5
-#: templates/complaints/inquiry_list.html:4
-#: templates/complaints/inquiry_list.html:11
 #: templates/layouts/partials/sidebar.html:48
 #: templates/layouts/partials/sidebar.html:221
 msgid "Inquiries"
@@ -2389,21 +2410,23 @@ msgid "Inquiries created via call center"
 msgstr "الاستفسارات المُنشأة عبر مركز الاتصال"
 
 #: templates/callcenter/inquiry_list.html:48
+#: templates/complaints/inquiry_list.html:104
 msgid "Total Inquiries"
 msgstr "إجمالي الاستفسارات"
 
 #: templates/callcenter/inquiry_list.html:117
-#: templates/complaints/inquiry_list.html:85
+#: templates/complaints/inquiry_list.html:219
 msgid "General"
 msgstr "عام"
 
 #: templates/callcenter/inquiry_list.html:152
-#: templates/complaints/inquiry_list.html:118
+#: templates/complaints/inquiry_detail.html:136
+#: templates/complaints/inquiry_list.html:302
 msgid "Contact"
 msgstr "جهة الاتصال"
 
 #: templates/callcenter/inquiry_list.html:203
-#: templates/complaints/inquiry_list.html:162
+#: templates/complaints/inquiry_list.html:392
 msgid "No inquiries found"
 msgstr "لم يتم العثور على استفسارات"
 
@@ -2577,25 +2600,44 @@ msgstr "متوسط وقت الحل"
 msgid "Back to Complaints"
 msgstr "الرجوع إلى الشكاوى"
 
+#: templates/complaints/complaint_detail.html:141
+#: templates/complaints/complaint_list.html:361
+#: templates/complaints/inquiry_detail.html:132
+#: templates/complaints/inquiry_detail.html:482
+#: templates/complaints/inquiry_form.html:302
+#: templates/complaints/inquiry_form.html:324
+#: templates/complaints/inquiry_list.html:334
+#: templates/organizations/patient_list.html:16
+#: templates/surveys/instance_detail.html:114
 msgid "MRN"
 msgstr "الرقم الطبي (MRN)"
 
+#: templates/complaints/complaint_detail.html:157
 msgid "SLA Deadline"
 msgstr "الموعد النهائي لاتفاقية مستوى الخدمة (SLA)"
 
+#: templates/complaints/complaint_detail.html:163
+#: templates/complaints/complaint_list.html:367
+#: templates/complaints/inquiry_detail.html:160
+#: templates/complaints/inquiry_list.html:327
 msgid "OVERDUE"
 msgstr "متأخرة"
 
+#: templates/complaints/complaint_detail.html:166
+#: templates/complaints/inquiry_detail.html:163
 msgid "remaining"
 msgstr "متبقية"
 
 #: templates/complaints/complaint_detail.html:187
+#: templates/complaints/inquiry_detail.html:185
 #: templates/observations/observation_detail.html:311
 msgid "Timeline"
 msgstr "الجدول الزمني"
 
 #: templates/complaints/complaint_detail.html:193
 #: templates/complaints/complaint_detail.html:356
+#: templates/complaints/inquiry_detail.html:191
+#: templates/complaints/inquiry_detail.html:343
 #: templates/observations/observation_detail.html:289
 #: templates/observations/public_new.html:326
 msgid "Attachments"
@@ -2606,69 +2648,96 @@ msgstr "المرفقات"
 msgid "PX Actions"
 msgstr "إجراءات تجربة المريض"
 
+#: templates/complaints/complaint_detail.html:271
 msgid "Resolution"
 msgstr "الحل"
 
+#: templates/complaints/complaint_detail.html:276
 msgid "Resolved by"
 msgstr "تم الحل بواسطة"
 
 #: templates/complaints/complaint_detail.html:277
-#: templates/complaints/inquiry_detail.html:71
+#: templates/complaints/inquiry_detail.html:264
 msgid "on"
 msgstr "في"
 
 #: templates/complaints/complaint_detail.html:292
+#: templates/complaints/inquiry_detail.html:279
 #: templates/observations/observation_detail.html:223
 #: templates/observations/public_track.html:287
 msgid "Last Updated"
 msgstr "آخر تحديث"
 
 #: templates/complaints/complaint_detail.html:304
+#: templates/complaints/inquiry_detail.html:291
 msgid "Activity Timeline"
 msgstr "الجدول الزمني للنشاط"
 
 #: templates/complaints/complaint_detail.html:345
+#: templates/complaints/inquiry_detail.html:332
 #: templates/observations/observation_detail.html:348
 msgid "No timeline entries yet"
 msgstr "لا توجد إدخالات في الجدول الزمني بعد"
 
 #: templates/complaints/complaint_detail.html:388
+#: templates/complaints/inquiry_detail.html:375
 msgid "No attachments"
 msgstr "لا توجد مرفقات"
 
+#: templates/complaints/complaint_detail.html:399
 msgid "Related PX Actions"
 msgstr "إجراءات PX المرتبطة"
 
+#: templates/complaints/complaint_detail.html:425
 msgid "No PX actions created yet"
 msgstr "لم يتم إنشاء أي إجراء PX بعد"
 
+#: templates/complaints/complaint_detail.html:449
+#: templates/complaints/inquiry_detail.html:399
 msgid "Select user..."
 msgstr "اختر المستخدم..."
 
+#: templates/complaints/complaint_detail.html:477
+#: templates/complaints/inquiry_detail.html:427
 msgid "Update Status"
 msgstr "تحديث الحالة"
 
+#: templates/complaints/complaint_detail.html:484
+#: templates/complaints/complaint_detail.html:609
 msgid "Escalate"
 msgstr "تصعيد"
 
+#: templates/complaints/complaint_detail.html:523
+#: templates/complaints/complaint_list.html:391
+#: templates/complaints/inquiry_detail.html:240
+#: templates/complaints/inquiry_detail.html:540
+#: templates/complaints/inquiry_list.html:364
+#: templates/observations/observation_list.html:370
 msgid "Unassigned"
 msgstr "غير معين"
 
+#: templates/complaints/complaint_detail.html:530
+#: templates/complaints/inquiry_detail.html:560
 msgid "Resolved By"
 msgstr "تم الحل بواسطة"
 
+#: templates/complaints/complaint_detail.html:543
 msgid "Closed By"
 msgstr "تم الإغلاق بواسطة"
 
+#: templates/complaints/complaint_detail.html:560
 msgid "Resolution Survey"
 msgstr "استبيان الحل"
 
+#: templates/complaints/complaint_detail.html:576
 msgid "View Survey"
 msgstr "عرض الاستبيان"
 
+#: templates/complaints/complaint_detail.html:592
 msgid "Escalate Complaint"
 msgstr "تصعيد الشكوى"
 
+#: templates/complaints/complaint_detail.html:598
 msgid "This will escalate the complaint to higher management"
 msgstr "سيؤدي ذلك إلى تصعيد الشكوى إلى الإدارة العليا"
 
@@ -2681,52 +2750,79 @@ msgstr "اشرح سبب حاجة هذه الشكوى إلى التصعيد..."
 msgid "New Complaint"
 msgstr "شكوى جديدة"
 
+#: templates/complaints/complaint_form.html:40
 msgid "Create New Complaint"
 msgstr "إنشاء شكوى جديدة"
 
+#: templates/complaints/complaint_form.html:42
 msgid "File a new patient complaint with SLA tracking"
 msgstr "تقديم شكوى مريض جديدة مع تتبع اتفاقية مستوى الخدمة (SLA)"
 
+#: templates/complaints/complaint_form.html:53
+#: templates/journeys/instance_detail.html:323
+#: templates/surveys/instance_detail.html:102
 msgid "Patient Information"
 msgstr "معلومات المريض"
 
+#: templates/complaints/complaint_form.html:60
 msgid "Search and select patient"
 msgstr "ابحث واختر المريض"
 
+#: templates/complaints/complaint_form.html:62
 msgid "Search by MRN or name"
 msgstr "ابحث برقم الملف الطبي أو الاسم"
 
+#: templates/complaints/complaint_form.html:83
+#: templates/complaints/inquiry_form.html:60
 msgid "Select hospital"
 msgstr "اختر المستشفى"
 
+#: templates/complaints/complaint_form.html:93
+#: templates/complaints/inquiry_form.html:70
+#: templates/complaints/inquiry_form.html:254
+#: templates/complaints/inquiry_form.html:261
 msgid "Select department"
 msgstr "اختر القسم"
 
+#: templates/complaints/complaint_form.html:102
 msgid "Select physician"
 msgstr "اختر الطبيب"
 
+#: templates/complaints/complaint_form.html:123
 msgid "Detailed description of the complaint..."
 msgstr "وصف مفصل للشكوى..."
 
+#: templates/complaints/complaint_form.html:130
+#: templates/complaints/inquiry_form.html:126
 msgid "Select category"
 msgstr "اختر الفئة"
 
+#: templates/complaints/complaint_form.html:161
 msgid "Select severity"
 msgstr "اختر شدة الشكوى"
 
+#: templates/complaints/complaint_form.html:175
+#: templates/complaints/inquiry_form.html:163
 msgid "Select priority"
 msgstr "اختر الأولوية"
 
+#: templates/complaints/complaint_form.html:186
+#: templates/complaints/inquiry_form.html:174
 msgid "Select source"
 msgstr "اختر المصدر"
 
+#: templates/complaints/complaint_form.html:189
+#: templates/complaints/inquiry_form.html:177
 msgid "Staff"
 msgstr "الموظف"
 
+#: templates/complaints/complaint_form.html:190
 msgid "Survey"
 msgstr "الاستبيان"
 
 #: templates/complaints/complaint_form.html:191
+#: templates/complaints/inquiry_form.html:182
+#: templates/complaints/inquiry_form.html:197
 #: templates/layouts/partials/sidebar.html:233
 msgid "Social Media"
 msgstr "وسائل التواصل الاجتماعي"
@@ -2735,27 +2831,37 @@ msgstr "وسائل التواصل الاجتماعي"
 msgid "Ministry of Health"
 msgstr "وزارة الصحة"
 
+#: templates/complaints/complaint_form.html:194
 msgid "Council of Health Insurance"
 msgstr "مجلس الضمان الصحي"
 
+#: templates/complaints/complaint_form.html:206
 msgid "SLA deadline will be automatically calculated based on severity"
-msgstr "سيتم حساب الموعد النهائي لاتفاقية مستوى الخدمة تلقائيًا بناءً على شدة الشكوى"
+msgstr ""
+"سيتم حساب الموعد النهائي لاتفاقية مستوى الخدمة تلقائيًا بناءً على شدة الشكوى"
 
+#: templates/complaints/complaint_form.html:209
 msgid "4 hours"
 msgstr "٤ ساعات"
 
+#: templates/complaints/complaint_form.html:210
 msgid "24 hours"
 msgstr "٢٤ ساعة"
 
+#: templates/complaints/complaint_form.html:211
 msgid "72 hours"
 msgstr "٧٢ ساعة"
 
+#: templates/complaints/complaint_form.html:212
 msgid "168 hours (7 days)"
 msgstr "١٦٨ ساعة (٧ أيام)"
 
+#: templates/complaints/complaint_list.html:5
+#: templates/complaints/complaint_list.html:87
 msgid "Complaints Console"
 msgstr "لوحة شكاوى المرضى"
 
+#: templates/complaints/complaint_list.html:89
 msgid "Manage and track patient complaints with SLA monitoring"
 msgstr "إدارة وتتبع شكاوى المرضى مع مراقبة اتفاقية مستوى الخدمة (SLA)"
 
@@ -2764,6 +2870,7 @@ msgid "Title, MRN, Patient name..."
 msgstr "العنوان، رقم الملف الطبي، اسم المريض..."
 
 #: templates/complaints/complaint_list.html:190
+#: templates/complaints/inquiry_list.html:187
 #: templates/observations/observation_list.html:196
 msgid "All Statuses"
 msgstr "جميع الحالات"
@@ -2774,10 +2881,12 @@ msgid "All Severities"
 msgstr "جميع درجات الخطورة"
 
 #: templates/complaints/complaint_list.html:215
+#: templates/complaints/inquiry_list.html:200
 msgid "All Priorities"
 msgstr "جميع الأولويات"
 
 #: templates/complaints/complaint_list.html:242
+#: templates/complaints/inquiry_list.html:228
 #: templates/physicians/department_overview.html:56
 #: templates/physicians/leaderboard.html:83
 #: templates/physicians/physician_list.html:65
@@ -2795,6 +2904,7 @@ msgid "All Departments"
 msgstr "جميع الأقسام"
 
 #: templates/complaints/complaint_list.html:268
+#: templates/complaints/inquiry_list.html:241
 #: templates/observations/observation_list.html:247
 msgid "All Users"
 msgstr "جميع المستخدمين"
@@ -2804,46 +2914,53 @@ msgid "SLA Status"
 msgstr "حالة اتفاقية مستوى الخدمة (SLA)"
 
 #: templates/complaints/complaint_list.html:318
+#: templates/complaints/inquiry_list.html:282
 msgid "Export CSV"
 msgstr "تصدير CSV"
 
+#: templates/complaints/complaint_list.html:321
+#: templates/complaints/inquiry_list.html:285
 msgid "Export Excel"
 msgstr "تصدير Excel"
 
-#: templates/complaints/inquiry_detail.html:4
-#: templates/complaints/inquiry_detail.html:11
-msgid "Inquiry Detail"
-msgstr "تفاصيل الاستفسار"
+#: templates/complaints/inquiry_detail.html:107
+#: templates/complaints/inquiry_form.html:36
+msgid "Back to Inquiries"
+msgstr "العودة إلى الاستفسارات"
 
-#: templates/complaints/inquiry_detail.html:27
-#: templates/complaints/inquiry_form.html:25
-msgid "Inquiry Information"
-msgstr "معلومات الاستفسار"
+msgid "Channel"
+msgstr "القناة"
 
-#: templates/complaints/inquiry_detail.html:67
-#: templates/complaints/inquiry_detail.html:88
+#: templates/complaints/inquiry_detail.html:258
 msgid "Response"
 msgstr "الرد"
 
-#: templates/complaints/inquiry_detail.html:70
+#: templates/complaints/inquiry_detail.html:263
 msgid "Responded by"
 msgstr "تم الرد من قبل"
 
-#: templates/complaints/inquiry_detail.html:82
+#: templates/complaints/inquiry_detail.html:455
 msgid "Respond to Inquiry"
 msgstr "الرد على الاستفسار"
 
-#: templates/complaints/inquiry_detail.html:92
+#: templates/complaints/inquiry_detail.html:461
+#: templates/feedback/feedback_detail.html:501
+msgid "Enter your response..."
+msgstr "أدخل ردك..."
+
+#: templates/complaints/inquiry_detail.html:463
 msgid "Send Response"
 msgstr "إرسال الرد"
 
-#: templates/complaints/inquiry_detail.html:105
-#: templates/complaints/inquiry_form.html:62
+#: templates/complaints/inquiry_detail.html:473
+#: templates/complaints/inquiry_form.html:79
 msgid "Contact Information"
 msgstr "معلومات الاتصال"
 
-#: templates/complaints/inquiry_detail.html:114
-#: templates/complaints/inquiry_detail.html:126
+#: templates/complaints/inquiry_detail.html:488
+#: templates/complaints/inquiry_detail.html:509
+#: templates/complaints/inquiry_form.html:178
+#: templates/complaints/inquiry_form.html:193
 #: templates/feedback/feedback_form.html:144
 #: templates/observations/observation_detail.html:269
 #: templates/observations/public_new.html:360
@@ -2854,8 +2971,10 @@ msgstr "معلومات الاتصال"
 msgid "Phone"
 msgstr "رقم الهاتف"
 
-#: templates/complaints/inquiry_detail.html:118
-#: templates/complaints/inquiry_detail.html:130
+#: templates/complaints/inquiry_detail.html:495
+#: templates/complaints/inquiry_detail.html:516
+#: templates/complaints/inquiry_form.html:179
+#: templates/complaints/inquiry_form.html:194
 #: templates/feedback/feedback_form.html:137
 #: templates/observations/observation_detail.html:275
 #: templates/observations/public_new.html:364
@@ -2864,37 +2983,93 @@ msgstr "رقم الهاتف"
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
-#: templates/complaints/inquiry_form.html:4
-#: templates/complaints/inquiry_form.html:11
-#: templates/complaints/inquiry_list.html:16
+#: templates/complaints/inquiry_detail.html:537
+#: templates/observations/public_track.html:309
+msgid "Assigned"
+msgstr "تم التعيين"
+
+msgid "Responded By"
+msgstr "تم الرد بواسطة"
+
 msgid "New Inquiry"
 msgstr "استفسار جديد"
 
-#: templates/complaints/inquiry_form.html:12
-msgid "Create a new patient inquiry"
-msgstr "إنشاء استفسار جديد للمريض"
+msgid "Create New Inquiry"
+msgstr "إنشاء استفسار جديد"
 
-#: templates/complaints/inquiry_form.html:52
+msgid "Create a new patient inquiry or request"
+msgstr "إنشاء استفسار أو طلب جديد للمريض"
+
+#: templates/complaints/inquiry_form.html:84
 msgid "Optional"
 msgstr "اختياري"
 
-#: templates/complaints/inquiry_form.html:53
+#: templates/complaints/inquiry_form.html:86
 msgid "Search by MRN or name..."
 msgstr "البحث برقم الملف الطبي أو الاسم..."
 
-#: templates/complaints/inquiry_form.html:62
-msgid "if not a registered patient"
-msgstr "إذا لم يكن مريضًا مسجلاً"
+#: templates/complaints/inquiry_form.html:93
+msgid "OR"
+msgstr "أو"
 
-#: templates/complaints/inquiry_form.html:121
+msgid "Name of contact person"
+msgstr "اسم جهة الاتصال"
+
+msgid "Pharmacy"
+msgstr "الصيدلية"
+
+msgid "Insurance"
+msgstr "التأمين"
+
+#: templates/complaints/inquiry_form.html:132
+#: templates/complaints/inquiry_list.html:218
+#: templates/feedback/feedback_delete_confirm.html:61
+#: templates/feedback/feedback_detail.html:154
+#: templates/feedback/feedback_form.html:65
+#: templates/layouts/partials/sidebar.html:67
+msgid "Feedback"
+msgstr "ملاحظات"
+
+#: templates/complaints/inquiry_form.html:147
+msgid "Detailed description of the inquiry..."
+msgstr "وصف تفصيلي للاستفسار..."
+
+msgid "Website"
+msgstr "الموقع الإلكتروني"
+
+msgid "Walk-in"
+msgstr "حضور شخصي"
+
+msgid "Select channel"
+msgstr "اختر القناة"
+
+msgid "In Person"
+msgstr "حضوريًا"
+
+msgid "Web Form"
+msgstr "نموذج ويب"
+
+msgid "Mobile App"
+msgstr "تطبيق الجوال"
+
+msgid "Fax"
+msgstr "فاكس"
+
+msgid "Optional due date"
+msgstr "تاريخ استحقاق اختياري"
+
+msgid "Leave empty for default based on priority"
+msgstr "اتركه فارغًا للاعتماد على الإعداد الافتراضي حسب الأولوية"
+
+#: templates/complaints/inquiry_form.html:217
 msgid "Help"
 msgstr "مساعدة"
 
-#: templates/complaints/inquiry_form.html:124
+#: templates/complaints/inquiry_form.html:220
 msgid "Use this form to create a new inquiry from a patient or visitor."
 msgstr "استخدم هذا النموذج لإنشاء استفسار جديد من مريض أو زائر."
 
-#: templates/complaints/inquiry_form.html:125
+#: templates/complaints/inquiry_form.html:224
 msgid ""
 "If the inquiry is from a registered patient, search and select them. "
 "Otherwise, provide contact information."
@@ -2902,34 +3077,31 @@ msgstr ""
 "إذا كان الاستفسار من مريض مسجل، ابحث عنه واختره. وإلا، يرجى تقديم معلومات "
 "الاتصال."
 
-#: templates/complaints/inquiry_form.html:126
+#: templates/complaints/inquiry_form.html:227
 msgid "Fields marked with * are required."
 msgstr "الحقول التي تحتوي على * مطلوبة."
 
-#: templates/complaints/inquiry_form.html:175
+#: templates/complaints/inquiry_form.html:290
 msgid "No patients found"
 msgstr "لم يتم العثور على مرضى"
 
-#: templates/complaints/inquiry_form.html:207
+#: templates/complaints/inquiry_form.html:323
 msgid "Selected Patient"
 msgstr "المريض المحدد"
 
-#: templates/complaints/inquiry_list.html:12
+#: templates/complaints/inquiry_list.html:5
+#: templates/complaints/inquiry_list.html:86
+msgid "Inquiries Console"
+msgstr "لوحة الاستفسارات"
+
+#: templates/complaints/inquiry_list.html:88
 msgid "Manage patient inquiries and requests"
 msgstr "إدارة استفسارات وطلبات المرضى"
 
-#: templates/complaints/inquiry_list.html:66
+#: templates/complaints/inquiry_list.html:179
 msgid "Subject, contact name..."
 msgstr "الموضوع، اسم جهة الاتصال..."
 
-#: templates/complaints/inquiry_list.html:99
-msgid "Apply"
-msgstr "تطبيق"
-
-#: templates/complaints/inquiry_list.html:109
-msgid "Inquiries List"
-msgstr "قائمة الاستفسارات"
-
 #: templates/config/dashboard.html:24
 msgid "SLA Configurations"
 msgstr "إعدادات SLA"
@@ -3054,13 +3226,6 @@ msgstr "رمز الحدث"
 msgid "Processed At"
 msgstr "تمت المعالجة في"
 
-#: templates/feedback/feedback_delete_confirm.html:61
-#: templates/feedback/feedback_detail.html:154
-#: templates/feedback/feedback_form.html:65
-#: templates/layouts/partials/sidebar.html:67
-msgid "Feedback"
-msgstr "ملاحظات"
-
 #: templates/feedback/feedback_delete_confirm.html:62
 msgid "Detail"
 msgstr "التفاصيل"
@@ -3081,10 +3246,6 @@ msgstr "أضف ملاحظة (اختياري)..."
 msgid "Add Response"
 msgstr "إضافة رد"
 
-#: templates/feedback/feedback_detail.html:501
-msgid "Enter your response..."
-msgstr "أدخل ردك..."
-
 #: templates/feedback/feedback_form.html:163
 msgid "Feedback Type"
 msgstr "نوع الملاحظة"
@@ -3607,10 +3768,6 @@ msgstr "تتبع"
 msgid "Status Progress"
 msgstr "تقدم الحالة"
 
-#: templates/observations/public_track.html:309
-msgid "Assigned"
-msgstr "تم التعيين"
-
 #: templates/observations/public_track.html:310
 msgid "Being reviewed by our team"
 msgstr "قيد المراجعة من قبل فريقنا"
diff --git a/templates/complaints/inquiry_detail.html b/templates/complaints/inquiry_detail.html
index 10e64df..0f66761 100644
--- a/templates/complaints/inquiry_detail.html
+++ b/templates/complaints/inquiry_detail.html
@@ -1,152 +1,571 @@
-{% extends 'layouts/base.html' %}
+{% extends "layouts/base.html" %}
 {% load i18n %}
+{% load static %}
 
-{% block title %}{% trans "Inquiry Detail" %}{% endblock %}
+{% block title %}Inquiry #{{ inquiry.id|slice:":8" }} - PX360{% endblock %}
+
+{% block extra_css %}
+<style>
+    .inquiry-header {
+        background: linear-gradient(135deg, #17a2b8 0%, #138496 100%);
+        color: white;
+        padding: 30px;
+        border-radius: 12px;
+        margin-bottom: 30px;
+    }
+    .due-date-badge {
+        background: rgba(255,255,255,0.2);
+        padding: 15px;
+        border-radius: 8px;
+        text-align: center;
+    }
+    .due-date-badge.overdue {
+        background: #d32f2f;
+    }
+    .status-badge {
+        padding: 6px 16px;
+        border-radius: 20px;
+        font-size: 0.9rem;
+        font-weight: 600;
+    }
+    .status-open { background: #e3f2fd; color: #1976d2; }
+    .status-in_progress { background: #fff3e0; color: #f57c00; }
+    .status-resolved { background: #e8f5e9; color: #388e3c; }
+    .status-closed { background: #f5f5f5; color: #616161; }
+    
+    .priority-badge {
+        padding: 6px 16px;
+        border-radius: 20px;
+        font-size: 0.9rem;
+        font-weight: 600;
+    }
+    .priority-low { background: #e8f5e9; color: #388e3c; }
+    .priority-medium { background: #fff3e0; color: #f57c00; }
+    .priority-high { background: #ffebee; color: #d32f2f; }
+    .priority-urgent { background: #880e4f; color: #fff; }
+    
+    .timeline {
+        position: relative;
+        padding-left: 30px;
+    }
+    .timeline::before {
+        content: '';
+        position: absolute;
+        left: 8px;
+        top: 0;
+        bottom: 0;
+        width: 2px;
+        background: #dee2e6;
+    }
+    .timeline-item {
+        position: relative;
+        padding-bottom: 30px;
+    }
+    .timeline-item::before {
+        content: '';
+        position: absolute;
+        left: -26px;
+        top: 5px;
+        width: 16px;
+        height: 16px;
+        border-radius: 50%;
+        background: #fff;
+        border: 3px solid #17a2b8;
+        z-index: 1;
+    }
+    .timeline-item.status_change::before {
+        border-color: #f57c00;
+    }
+    .timeline-item.response::before {
+        border-color: #388e3c;
+    }
+    .timeline-item.note::before {
+        border-color: #1976d2;
+    }
+    
+    .info-label {
+        font-weight: 600;
+        color: #6c757d;
+        font-size: 0.85rem;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+    }
+    
+    .info-value {
+        font-size: 1rem;
+        color: #212529;
+        margin-top: 4px;
+    }
+</style>
+{% endblock %}
 
 {% block content %}
 <div class="container-fluid">
-    <!-- Page Header -->
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div>
-            <h1 class="h3 mb-0">{% trans "Inquiry Detail" %}</h1>
-            <p class="text-muted">{{ inquiry.subject }}</p>
-        </div>
-        <div>
-            <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-secondary">
-                <i class="fas fa-arrow-left"></i> {% trans "Back to List" %}
-            </a>
+    <!-- Back Button -->
+    <div class="mb-3">
+        <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-outline-secondary btn-sm">
+            <i class="bi bi-arrow-left me-1"></i> {{ _("Back to Inquiries")}}
+        </a>
+    </div>
+
+    <!-- Inquiry Header -->
+    <div class="inquiry-header">
+        <div class="row align-items-center">
+            <div class="col-md-8">
+                <div class="d-flex align-items-center mb-2">
+                    <h3 class="mb-0 me-3">{{ inquiry.subject }}</h3>
+                    <span class="status-badge status-{{ inquiry.status }}">
+                        {{ inquiry.get_status_display }}
+                    </span>
+                    {% if inquiry.priority %}
+                    <span class="priority-badge priority-{{ inquiry.priority }} ms-2">
+                        {{ inquiry.get_priority_display }}
+                    </span>
+                    {% endif %}
+                </div>
+                <p class="mb-2">
+                    <i class="bi bi-hash me-1"></i>
+                    <strong>{{ _("ID") }}:</strong> {{ inquiry.id|slice:":8" }}
+                    {% if inquiry.patient %}
+                    <span class="mx-2">|</span>
+                    <i class="bi bi-person-fill me-1"></i>
+                    <strong>{{ _("Patient") }}:</strong> {{ inquiry.patient.get_full_name }} ({{ _("MRN") }}: {{ inquiry.patient.mrn }})
+                    {% else %}
+                    <span class="mx-2">|</span>
+                    <i class="bi bi-person me-1"></i>
+                    <strong>{{ _("Contact") }}:</strong> {{ inquiry.contact_name|default:inquiry.contact_email }}
+                    {% endif %}
+                </p>
+                <p class="mb-0">
+                    <i class="bi bi-hospital me-1"></i>
+                    <strong>{{ _("Hospital") }}:</strong> {{ inquiry.hospital.name_en }}
+                    {% if inquiry.department %}
+                    <span class="mx-2">|</span>
+                    <i class="bi bi-building me-1"></i>
+                    <strong>{{ _("Department") }}:</strong> {{ inquiry.department.name_en }}
+                    {% endif %}
+                </p>
+            </div>
+            <div class="col-md-4">
+                {% if inquiry.due_date %}
+                <div class="due-date-badge {% if inquiry.is_overdue %}overdue{% endif %}">
+                    <div class="mb-1">
+                        <i class="bi bi-clock-history me-1"></i>
+                        <strong>{{ _("Due Date")}}</strong>
+                    </div>
+                    <h4 class="mb-0">{{ inquiry.due_date|date:"M d, Y H:i" }}</h4>
+                    {% if inquiry.is_overdue %}
+                    <div class="mt-2">
+                        <i class="bi bi-exclamation-triangle-fill me-1"></i>
+                        <strong>{{ _("OVERDUE") }}</strong>
+                    </div>
+                    {% else %}
+                    <small>{{ inquiry.due_date|timeuntil }} {{ _("remaining") }}</small>
+                    {% endif %}
+                </div>
+                {% endif %}
+            </div>
         </div>
     </div>
 
     <div class="row">
         <!-- Main Content -->
         <div class="col-lg-8">
-            <!-- Inquiry Details -->
-            <div class="card mb-4">
-                <div class="card-header">
-                    <h6 class="m-0 font-weight-bold">{% trans "Inquiry Information" %}</h6>
-                </div>
-                <div class="card-body">
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <strong>{% trans "Subject" %}:</strong><br>
-                            {{ inquiry.subject }}
+            <!-- Tabs -->
+            <ul class="nav nav-tabs mb-3" id="inquiryTabs" role="tablist">
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link active" id="details-tab" data-bs-toggle="tab" 
+                            data-bs-target="#details" type="button" role="tab">
+                        <i class="bi bi-info-circle me-1"></i> {{ _("Details") }}
+                    </button>
+                </li>
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link" id="timeline-tab" data-bs-toggle="tab" 
+                            data-bs-target="#timeline" type="button" role="tab">
+                        <i class="bi bi-clock-history me-1"></i> {{ _("Timeline") }} ({{ timeline.count }})
+                    </button>
+                </li>
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link" id="attachments-tab" data-bs-toggle="tab" 
+                            data-bs-target="#attachments" type="button" role="tab">
+                        <i class="bi bi-paperclip me-1"></i> {{ _("Attachments") }} ({{ attachments.count }})
+                    </button>
+                </li>
+            </ul>
+
+            <!-- Tab Content -->
+            <div class="tab-content" id="inquiryTabsContent">
+                <!-- Details Tab -->
+                <div class="tab-pane fade show active" id="details" role="tabpanel">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title mb-4">{% trans "Inquiry Details" %}</h5>
+                            
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <div class="info-label">{{ _("Category") }}</div>
+                                    <div class="info-value">
+                                        <span class="badge bg-secondary">{{ inquiry.get_category_display }}</span>
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="info-label">{{ _("Source") }}</div>
+                                    <div class="info-value">
+                                        {% if inquiry.source %}
+                                        {{ inquiry.get_source_display }}
+                                        {% else %}
+                                        <span class="text-muted">{{ _("N/A")}}</span>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                            
+                            <div class="row mb-3">
+                                <div class="col-md-6">
+                                    <div class="info-label">{{ _("Channel") }}</div>
+                                    <div class="info-value">
+                                        {% if inquiry.channel %}
+                                        {{ inquiry.get_channel_display }}
+                                        {% else %}
+                                        <span class="text-muted">{{ _("N/A")}}</span>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="info-label">{{ _("Assigned To")}}</div>
+                                    <div class="info-value">
+                                        {% if inquiry.assigned_to %}
+                                        {{ inquiry.assigned_to.get_full_name }}
+                                        {% else %}
+                                        <span class="text-muted">{{ _("Unassigned") }}</span>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                            
+                            <hr>
+                            
+                            <div class="mb-3">
+                                <div class="info-label">{{ _("Message") }}</div>
+                                <div class="info-value mt-2">
+                                    <p class="mb-0">{{ inquiry.message|linebreaks }}</p>
+                                </div>
+                            </div>
+                            
+                            {% if inquiry.response %}
+                            <hr>
+                            <div class="mb-3">
+                                <div class="info-label">{{ _("Response") }}</div>
+                                <div class="info-value mt-2">
+                                    <div class="alert alert-success">
+                                        <p class="mb-2">{{ inquiry.response|linebreaks }}</p>
+                                        <small class="text-muted">
+                                            {{ _("Responded by")}} {{ inquiry.responded_by.get_full_name }}
+                                            {{ _("on") }} {{ inquiry.responded_at|date:"M d, Y H:i" }}
+                                        </small>
+                                    </div>
+                                </div>
+                            </div>
+                            {% endif %}
+                            
+                            <hr>
+                            
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <div class="info-label">{{ _("Created") }}</div>
+                                    <div class="info-value">{{ inquiry.created_at|date:"M d, Y H:i" }}</div>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="info-label">{{ _("Last Updated")}}</div>
+                                    <div class="info-value">{{ inquiry.updated_at|date:"M d, Y H:i" }}</div>
+                                </div>
+                            </div>
                         </div>
-                        <div class="col-md-6">
-                            <strong>{% trans "Status" %}:</strong><br>
-                            {% if inquiry.status == 'open' %}
-                                <span class="badge bg-warning">{% trans "Open" %}</span>
-                            {% elif inquiry.status == 'in_progress' %}
-                                <span class="badge bg-info">{% trans "In Progress" %}</span>
-                            {% elif inquiry.status == 'resolved' %}
-                                <span class="badge bg-success">{% trans "Resolved" %}</span>
+                    </div>
+                </div>
+
+                <!-- Timeline Tab -->
+                <div class="tab-pane fade" id="timeline" role="tabpanel">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title mb-4">{% trans "Activity Timeline" %}</h5>
+                            
+                            {% if timeline %}
+                            <div class="timeline">
+                                {% for update in timeline %}
+                                <div class="timeline-item {{ update.update_type }}">
+                                    <div class="card mb-3">
+                                        <div class="card-body">
+                                            <div class="d-flex justify-content-between align-items-start mb-2">
+                                                <div>
+                                                    <span class="badge bg-primary">{{ update.get_update_type_display }}</span>
+                                                    {% if update.created_by %}
+                                                    <span class="text-muted ms-2">
+                                                        by {{ update.created_by.get_full_name }}
+                                                    </span>
+                                                    {% endif %}
+                                                </div>
+                                                <small class="text-muted">
+                                                    {{ update.created_at|date:"M d, Y H:i" }}
+                                                </small>
+                                            </div>
+                                            <p class="mb-0">{{ update.message }}</p>
+                                            {% if update.old_status and update.new_status %}
+                                            <div class="mt-2">
+                                                <span class="status-badge status-{{ update.old_status }}">
+                                                    {{ update.old_status }}
+                                                </span>
+                                                <i class="bi bi-arrow-right mx-2"></i>
+                                                <span class="status-badge status-{{ update.new_status }}">
+                                                    {{ update.new_status }}
+                                                </span>
+                                            </div>
+                                            {% endif %}
+                                        </div>
+                                    </div>
+                                </div>
+                                {% endfor %}
+                            </div>
                             {% else %}
-                                <span class="badge bg-secondary">{{ inquiry.get_status_display }}</span>
+                            <div class="text-center py-5">
+                                <i class="bi bi-clock-history" style="font-size: 3rem; color: #ccc;"></i>
+                                <p class="text-muted mt-3">{{ _("No timeline entries yet")}}</p>
+                            </div>
                             {% endif %}
                         </div>
                     </div>
-                    
-                    <div class="row mb-3">
-                        <div class="col-md-6">
-                            <strong>{% trans "Category" %}:</strong><br>
-                            <span class="badge bg-secondary">{{ inquiry.get_category_display }}</span>
-                        </div>
-                        <div class="col-md-6">
-                            <strong>{% trans "Created" %}:</strong><br>
-                            {{ inquiry.created_at|date:"Y-m-d H:i" }}
+                </div>
+
+                <!-- Attachments Tab -->
+                <div class="tab-pane fade" id="attachments" role="tabpanel">
+                    <div class="card">
+                        <div class="card-body">
+                            <h5 class="card-title mb-4">{% trans "Attachments" %}</h5>
+                            
+                            {% if attachments %}
+                            <div class="list-group">
+                                {% for attachment in attachments %}
+                                <div class="list-group-item">
+                                    <div class="d-flex justify-content-between align-items-center">
+                                        <div>
+                                            <i class="bi bi-file-earmark me-2"></i>
+                                            <strong>{{ attachment.filename }}</strong>
+                                            <br>
+                                            <small class="text-muted">
+                                                Uploaded by {{ attachment.uploaded_by.get_full_name }} 
+                                                on {{ attachment.created_at|date:"M d, Y H:i" }}
+                                                ({{ attachment.file_size|filesizeformat }})
+                                            </small>
+                                            {% if attachment.description %}
+                                            <br>
+                                            <small>{{ attachment.description }}</small>
+                                            {% endif %}
+                                        </div>
+                                        <a href="{{ attachment.file.url }}" class="btn btn-sm btn-outline-primary" 
+                                           target="_blank" download>
+                                            <i class="bi bi-download"></i>
+                                        </a>
+                                    </div>
+                                </div>
+                                {% endfor %}
+                            </div>
+                            {% else %}
+                            <div class="text-center py-5">
+                                <i class="bi bi-paperclip" style="font-size: 3rem; color: #ccc;"></i>
+                                <p class="text-muted mt-3">{{ _("No attachments")}}</p>
+                            </div>
+                            {% endif %}
                         </div>
                     </div>
-
-                    <div class="mb-3">
-                        <strong>{% trans "Message" %}:</strong><br>
-                        <p class="mt-2">{{ inquiry.message|linebreaks }}</p>
-                    </div>
-
-                    {% if inquiry.response %}
-                    <div class="alert alert-success">
-                        <strong>{% trans "Response" %}:</strong><br>
-                        <p class="mt-2 mb-0">{{ inquiry.response|linebreaks }}</p>
-                        <small class="text-muted">
-                            {% trans "Responded by" %} {{ inquiry.responded_by.get_full_name }} 
-                            {% trans "on" %} {{ inquiry.responded_at|date:"Y-m-d H:i" }}
-                        </small>
-                    </div>
-                    {% endif %}
                 </div>
             </div>
+        </div>
 
-            <!-- Response Form -->
-            {% if can_edit and inquiry.status != 'resolved' and inquiry.status != 'closed' %}
-            <div class="card">
-                <div class="card-header">
-                    <h6 class="m-0 font-weight-bold">{% trans "Respond to Inquiry" %}</h6>
+        <!-- Sidebar Actions -->
+        <div class="col-lg-4">
+            <!-- Quick Actions -->
+            {% if can_edit %}
+            <div class="card mb-3">
+                <div class="card-header bg-info text-white">
+                    <h6 class="mb-0"><i class="bi bi-lightning-fill me-2"></i>{% trans "Quick Actions" %}</h6>
                 </div>
                 <div class="card-body">
-                    <form method="post" action="{% url 'complaints:inquiry_respond' inquiry.id %}">
+                    <!-- Assign -->
+                    <form method="post" action="{% url 'complaints:inquiry_assign' inquiry.id %}" class="mb-3">
                         {% csrf_token %}
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Response" %}</label>
-                            <textarea name="response" class="form-control" rows="5" required></textarea>
+                        <label class="form-label">{% trans "Assign To" %}</label>
+                        <div class="input-group">
+                            <select name="user_id" class="form-select" required>
+                                <option value="">{{ _("Select user...")}}</option>
+                                {% for user_obj in assignable_users %}
+                                <option value="{{ user_obj.id }}" 
+                                        {% if inquiry.assigned_to and inquiry.assigned_to.id == user_obj.id %}selected{% endif %}>
+                                    {{ user_obj.get_full_name }}
+                                </option>
+                                {% endfor %}
+                            </select>
+                            <button type="submit" class="btn btn-info">
+                                <i class="bi bi-person-check"></i>
+                            </button>
                         </div>
-                        <button type="submit" class="btn btn-primary">
-                            <i class="fas fa-paper-plane"></i> {% trans "Send Response" %}
+                    </form>
+                    
+                    <!-- Change Status -->
+                    <form method="post" action="{% url 'complaints:inquiry_change_status' inquiry.id %}" class="mb-3">
+                        {% csrf_token %}
+                        <label class="form-label">{% trans "Change Status" %}</label>
+                        <select name="status" class="form-select mb-2" required>
+                            {% for value, label in status_choices %}
+                            <option value="{{ value }}" {% if inquiry.status == value %}selected{% endif %}>
+                                {{ label }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                        <textarea name="note" class="form-control mb-2" rows="2" 
+                                  placeholder="{% trans 'Optional note...' %}"></textarea>
+                        <button type="submit" class="btn btn-info w-100">
+                            <i class="bi bi-arrow-repeat me-1"></i> {{ _("Update Status")}}
                         </button>
                     </form>
                 </div>
             </div>
             {% endif %}
-        </div>
-
-        <!-- Sidebar -->
-        <div class="col-lg-4">
+            
+            <!-- Add Note -->
+            <div class="card mb-3">
+                <div class="card-header bg-success text-white">
+                    <h6 class="mb-0"><i class="bi bi-chat-left-text me-2"></i>{% trans "Add Note" %}</h6>
+                </div>
+                <div class="card-body">
+                    <form method="post" action="{% url 'complaints:inquiry_add_note' inquiry.id %}">
+                        {% csrf_token %}
+                        <textarea name="note" class="form-control mb-2" rows="3" 
+                                  placeholder="{% trans 'Enter your note...' %}" required></textarea>
+                        <button type="submit" class="btn btn-success w-100">
+                            <i class="bi bi-plus-circle me-1"></i> {{ _("Add Note")}}
+                        </button>
+                    </form>
+                </div>
+            </div>
+            
+            <!-- Response Form -->
+            {% if can_edit and inquiry.status != 'resolved' and inquiry.status != 'closed' %}
+            <div class="card mb-3">
+                <div class="card-header bg-primary text-white">
+                    <h6 class="mb-0"><i class="bi bi-reply-fill me-2"></i>{% trans "Respond to Inquiry" %}</h6>
+                </div>
+                <div class="card-body">
+                    <form method="post" action="{% url 'complaints:inquiry_respond' inquiry.id %}">
+                        {% csrf_token %}
+                        <textarea name="response" class="form-control mb-2" rows="4" 
+                                  placeholder="{% trans 'Enter your response...' %}" required></textarea>
+                        <button type="submit" class="btn btn-primary w-100">
+                            <i class="bi bi-send me-1"></i> {{ _("Send Response")}}
+                        </button>
+                    </form>
+                </div>
+            </div>
+            {% endif %}
+            
             <!-- Contact Information -->
-            <div class="card mb-4">
+            <div class="card mb-3">
                 <div class="card-header">
-                    <h6 class="m-0 font-weight-bold">{% trans "Contact Information" %}</h6>
+                    <h6 class="mb-0"><i class="bi bi-info-circle me-2"></i>{% trans "Contact Information" %}</h6>
                 </div>
                 <div class="card-body">
                     {% if inquiry.patient %}
-                        <p><strong>{% trans "Patient" %}:</strong><br>
-                        {{ inquiry.patient.get_full_name }}<br>
-                        <small class="text-muted">MRN: {{ inquiry.patient.mrn }}</small></p>
+                        <div class="mb-3">
+                            <div class="info-label">{{ _("Patient")}}</div>
+                            <div class="info-value">
+                                {{ inquiry.patient.get_full_name }}
+                                <br>
+                                <small class="text-muted">{{ _("MRN") }}: {{ inquiry.patient.mrn }}</small>
+                            </div>
+                        </div>
                         
                         {% if inquiry.patient.phone %}
-                        <p><strong>{% trans "Phone" %}:</strong><br>{{ inquiry.patient.phone }}</p>
+                        <div class="mb-3">
+                            <div class="info-label">{{ _("Phone")}}</div>
+                            <div class="info-value">{{ inquiry.patient.phone }}</div>
+                        </div>
                         {% endif %}
                         
                         {% if inquiry.patient.email %}
-                        <p><strong>{% trans "Email" %}:</strong><br>{{ inquiry.patient.email }}</p>
+                        <div class="mb-3">
+                            <div class="info-label">{{ _("Email")}}</div>
+                            <div class="info-value">{{ inquiry.patient.email }}</div>
+                        </div>
                         {% endif %}
                     {% else %}
                         {% if inquiry.contact_name %}
-                        <p><strong>{% trans "Name" %}:</strong><br>{{ inquiry.contact_name }}</p>
+                        <div class="mb-3">
+                            <div class="info-label">{{ _("Name")}}</div>
+                            <div class="info-value">{{ inquiry.contact_name }}</div>
+                        </div>
                         {% endif %}
                         
                         {% if inquiry.contact_phone %}
-                        <p><strong>{% trans "Phone" %}:</strong><br>{{ inquiry.contact_phone }}</p>
+                        <div class="mb-3">
+                            <div class="info-label">{{ _("Phone")}}</div>
+                            <div class="info-value">{{ inquiry.contact_phone }}</div>
+                        </div>
                         {% endif %}
                         
                         {% if inquiry.contact_email %}
-                        <p><strong>{% trans "Email" %}:</strong><br>{{ inquiry.contact_email }}</p>
+                        <div class="mb-3">
+                            <div class="info-label">{{ _("Email")}}</div>
+                            <div class="info-value">{{ inquiry.contact_email }}</div>
+                        </div>
                         {% endif %}
                     {% endif %}
                 </div>
             </div>
-
-            <!-- Organization -->
-            <div class="card mb-4">
+            
+            <!-- Assignment Info -->
+            <div class="card">
                 <div class="card-header">
-                    <h6 class="m-0 font-weight-bold">{% trans "Organization" %}</h6>
+                    <h6 class="mb-0"><i class="bi bi-person-check me-2"></i>{% trans "Assignment Info" %}</h6>
                 </div>
                 <div class="card-body">
-                    <p><strong>{% trans "Hospital" %}:</strong><br>{{ inquiry.hospital.name }}</p>
+                    <div class="mb-3">
+                        <div class="info-label">{{ _("Assigned To")}}</div>
+                        <div class="info-value">
+                            {% if inquiry.assigned_to %}
+                            {{ inquiry.assigned_to.get_full_name }}
+                            <br>
+                            <small class="text-muted">
+                                {{ _("Assigned") }} {{ inquiry.assigned_at|date:"M d, Y H:i"|default:_("N/A") }}
+                            </small>
+                            {% else %}
+                            <span class="text-muted">{{ _("Unassigned") }}</span>
+                            {% endif %}
+                        </div>
+                    </div>
                     
-                    {% if inquiry.department %}
-                    <p><strong>{% trans "Department" %}:</strong><br>{{ inquiry.department.name }}</p>
+                    {% if inquiry.responded_by %}
+                    <div class="mb-3">
+                        <div class="info-label">{{ _("Responded By")}}</div>
+                        <div class="info-value">
+                            {{ inquiry.responded_by.get_full_name }}
+                            <br>
+                            <small class="text-muted">
+                                {{ inquiry.responded_at|date:"M d, Y H:i" }}
+                            </small>
+                        </div>
+                    </div>
                     {% endif %}
                     
-                    {% if inquiry.assigned_to %}
-                    <p><strong>{% trans "Assigned To" %}:</strong><br>{{ inquiry.assigned_to.get_full_name }}</p>
+                    {% if inquiry.resolved_by %}
+                    <div class="mb-0">
+                        <div class="info-label">{{ _("Resolved By")}}</div>
+                        <div class="info-value">
+                            {{ inquiry.resolved_by.get_full_name }}
+                            <br>
+                            <small class="text-muted">
+                                {{ inquiry.resolved_at|date:"M d, Y H:i" }}
+                            </small>
+                        </div>
+                    </div>
                     {% endif %}
                 </div>
             </div>
diff --git a/templates/complaints/inquiry_form.html b/templates/complaints/inquiry_form.html
index 3dde76f..5ea747e 100644
--- a/templates/complaints/inquiry_form.html
+++ b/templates/complaints/inquiry_form.html
@@ -1,162 +1,277 @@
-{% extends 'layouts/base.html' %}
+{% extends "layouts/base.html" %}
 {% load i18n %}
+{% load static %}
 
-{% block title %}{% trans "New Inquiry" %}{% endblock %}
+{% block title %}{{ _("New Inquiry")}} - PX360{% endblock %}
+
+{% block extra_css %}
+<style>
+    .form-section {
+        background: #fff;
+        border: 1px solid #dee2e6;
+        border-radius: 8px;
+        padding: 25px;
+        margin-bottom: 20px;
+    }
+    .form-section-title {
+        font-size: 1.1rem;
+        font-weight: 600;
+        color: #495057;
+        margin-bottom: 20px;
+        padding-bottom: 10px;
+        border-bottom: 2px solid #17a2b8;
+    }
+    .required-field::after {
+        content: " *";
+        color: #dc3545;
+    }
+</style>
+{% endblock %}
 
 {% block content %}
 <div class="container-fluid">
     <!-- Page Header -->
-    <div class="d-flex justify-content-between align-items-center mb-4">
-        <div>
-            <h1 class="h3 mb-0">{% trans "New Inquiry" %}</h1>
-            <p class="text-muted">{% trans "Create a new patient inquiry" %}</p>
-        </div>
-        <div>
-            <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-secondary">
-                <i class="fas fa-arrow-left"></i> {% trans "Back to List" %}
-            </a>
-        </div>
+    <div class="mb-4">
+        <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-outline-secondary btn-sm mb-3">
+            <i class="bi bi-arrow-left me-1"></i> {{ _("Back to Inquiries")}}
+        </a>
+        <h2 class="mb-1">
+            <i class="bi bi-plus-circle text-info me-2"></i>
+            {{ _("Create New Inquiry")}}
+        </h2>
+        <p class="text-muted mb-0">{{ _("Create a new patient inquiry or request")}}</p>
     </div>
 
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="card">
-                <div class="card-header">
-                    <h6 class="m-0 font-weight-bold">{% trans "Inquiry Information" %}</h6>
-                </div>
-                <div class="card-body">
-                    <form method="post">
-                        {% csrf_token %}
-                        
-                        <!-- Hospital Selection -->
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Hospital" %} <span class="text-danger">*</span></label>
-                            <select name="hospital_id" class="form-select" required id="hospital-select">
-                                <option value="">{% trans "Select Hospital" %}</option>
+    <form method="post" action="{% url 'complaints:inquiry_create' %}" id="inquiryForm">
+        {% csrf_token %}
+        
+        <div class="row">
+            <div class="col-lg-8">
+                <!-- Organization Information -->
+                <div class="form-section">
+                    <h5 class="form-section-title">
+                        <i class="bi bi-hospital me-2"></i>{{ _("Organization") }}
+                    </h5>
+                    
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label required-field">{% trans "Hospital" %}</label>
+                            <select name="hospital_id" class="form-select" id="hospital-select" required>
+                                <option value="">{{ _("Select hospital")}}</option>
                                 {% for hospital in hospitals %}
-                                <option value="{{ hospital.id }}">{{ hospital.name }}</option>
+                                <option value="{{ hospital.id }}">{{ hospital.name_en }}</option>
                                 {% endfor %}
                             </select>
                         </div>
-
-                        <!-- Department Selection -->
-                        <div class="mb-3">
+                        
+                        <div class="col-md-6 mb-3">
                             <label class="form-label">{% trans "Department" %}</label>
                             <select name="department_id" class="form-select" id="department-select">
-                                <option value="">{% trans "Select Department" %}</option>
+                                <option value="">{{ _("Select department")}}</option>
                             </select>
                         </div>
+                    </div>
+                </div>
 
-                        <!-- Patient Search -->
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Patient" %} ({% trans "Optional" %})</label>
-                            <input type="text" class="form-control" id="patient-search" placeholder="{% trans 'Search by MRN or name...' %}">
-                            <input type="hidden" name="patient_id" id="patient-id">
-                            <div id="patient-results" class="list-group mt-2" style="display: none;"></div>
-                            <div id="selected-patient" class="alert alert-info mt-2" style="display: none;"></div>
+                <!-- Contact/Patient Information -->
+                <div class="form-section">
+                    <h5 class="form-section-title">
+                        <i class="bi bi-person-fill me-2"></i>{{ _("Contact Information")}}
+                    </h5>
+                    
+                    <!-- Patient Search -->
+                    <div class="mb-3">
+                        <label class="form-label">{% trans "Patient" %} ({% trans "Optional" %})</label>
+                        <input type="text" class="form-control" id="patient-search" 
+                               placeholder="{% trans 'Search by MRN or name...' %}">
+                        <input type="hidden" name="patient_id" id="patient-id">
+                        <div id="patient-results" class="list-group mt-2" style="display: none;"></div>
+                        <div id="selected-patient" class="alert alert-info mt-2" style="display: none;"></div>
+                    </div>
+
+                    <div class="text-muted mb-3">
+                        <small>{{ _("OR") }}</small>
+                    </div>
+
+                    <!-- Contact Information (if no patient) -->
+                    <div class="mb-3">
+                        <label class="form-label">{% trans "Contact Name" %}</label>
+                        <input type="text" name="contact_name" class="form-control"
+                               placeholder="{% trans 'Name of contact person' %}">
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">{% trans "Contact Phone" %}</label>
+                            <input type="tel" name="contact_phone" class="form-control"
+                                   placeholder="{% trans 'Phone number' %}">
                         </div>
-
-                        <hr>
-
-                        <!-- Contact Information (if no patient) -->
-                        <h6 class="mb-3">{% trans "Contact Information" %} ({% trans "if not a registered patient" %})</h6>
-                        
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Contact Name" %}</label>
-                            <input type="text" name="contact_name" class="form-control">
+                        <div class="col-md-6 mb-3">
+                            <label class="form-label">{% trans "Contact Email" %}</label>
+                            <input type="email" name="contact_email" class="form-control"
+                                   placeholder="{% trans 'Email address' %}">
                         </div>
+                    </div>
+                </div>
 
-                        <div class="row">
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">{% trans "Contact Phone" %}</label>
-                                <input type="tel" name="contact_phone" class="form-control">
-                            </div>
-                            <div class="col-md-6 mb-3">
-                                <label class="form-label">{% trans "Contact Email" %}</label>
-                                <input type="email" name="contact_email" class="form-control">
-                            </div>
-                        </div>
+                <!-- Inquiry Details -->
+                <div class="form-section">
+                    <h5 class="form-section-title">
+                        <i class="bi bi-file-text me-2"></i>{{ _("Inquiry Details")}}
+                    </h5>
+                    
+                    <div class="mb-3">
+                        <label class="form-label required-field">{% trans "Category" %}</label>
+                        <select name="category" class="form-select" required>
+                            <option value="">{{ _("Select category")}}</option>
+                            <option value="appointment">{{ _("Appointment")}}</option>
+                            <option value="billing">{{ _("Billing")}}</option>
+                            <option value="medical_records">{{ _("Medical Records")}}</option>
+                            <option value="pharmacy">{{ _("Pharmacy")}}</option>
+                            <option value="insurance">{{ _("Insurance")}}</option>
+                            <option value="feedback">{{ _("Feedback")}}</option>
+                            <option value="general">{{ _("General Information")}}</option>
+                            <option value="other">{{ _("Other")}}</option>
+                        </select>
+                    </div>
 
-                        <hr>
+                    <div class="mb-3">
+                        <label class="form-label required-field">{% trans "Subject" %}</label>
+                        <input type="text" name="subject" class="form-control" required maxlength="500"
+                               placeholder="{% trans 'Brief summary of the inquiry' %}">
+                    </div>
 
-                        <!-- Inquiry Details -->
-                        <h6 class="mb-3">{% trans "Inquiry Details" %}</h6>
+                    <div class="mb-3">
+                        <label class="form-label required-field">{% trans "Message" %}</label>
+                        <textarea name="message" class="form-control" rows="6" required
+                                  placeholder="{% trans 'Detailed description of the inquiry...' %}"></textarea>
+                    </div>
+                </div>
+            </div>
 
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Category" %} <span class="text-danger">*</span></label>
-                            <select name="category" class="form-select" required>
-                                <option value="">{% trans "Select Category" %}</option>
-                                <option value="appointment">{% trans "Appointment" %}</option>
-                                <option value="billing">{% trans "Billing" %}</option>
-                                <option value="medical_records">{% trans "Medical Records" %}</option>
-                                <option value="general">{% trans "General Information" %}</option>
-                                <option value="other">{% trans "Other" %}</option>
-                            </select>
-                        </div>
+            <!-- Sidebar -->
+            <div class="col-lg-4">
+                <!-- Classification -->
+                <div class="form-section">
+                    <h5 class="form-section-title">
+                        <i class="bi bi-tags me-2"></i>{{ _("Classification") }}
+                    </h5>
+                    
+                    <div class="mb-3">
+                        <label class="form-label">{% trans "Priority" %}</label>
+                        <select name="priority" class="form-select">
+                            <option value="">{{ _("Select priority")}}</option>
+                            <option value="low">{{ _("Low") }}</option>
+                            <option value="medium" selected>{{ _("Medium") }}</option>
+                            <option value="high">{{ _("High") }}</option>
+                            <option value="urgent">{{ _("Urgent") }}</option>
+                        </select>
+                    </div>
+                    
+                    <div class="mb-3">
+                        <label class="form-label">{% trans "Source" %}</label>
+                        <select name="source" class="form-select">
+                            <option value="">{{ _("Select source")}}</option>
+                            <option value="patient">{{ _("Patient") }}</option>
+                            <option value="family">{{ _("Family Member")}}</option>
+                            <option value="staff">{{ _("Staff") }}</option>
+                            <option value="phone">{{ _("Phone") }}</option>
+                            <option value="email">{{ _("Email") }}</option>
+                            <option value="website">{{ _("Website") }}</option>
+                            <option value="walk_in">{{ _("Walk-in") }}</option>
+                            <option value="social_media">{{ _("Social Media")}}</option>
+                            <option value="call_center">{{ _("Call Center")}}</option>
+                            <option value="other">{{ _("Other")}}</option>
+                        </select>
+                    </div>
 
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Subject" %} <span class="text-danger">*</span></label>
-                            <input type="text" name="subject" class="form-control" required maxlength="500">
-                        </div>
+                    <div class="mb-3">
+                        <label class="form-label">{% trans "Channel" %}</label>
+                        <select name="channel" class="form-select">
+                            <option value="">{{ _("Select channel")}}</option>
+                            <option value="in_person">{{ _("In Person") }}</option>
+                            <option value="phone">{{ _("Phone") }}</option>
+                            <option value="email">{{ _("Email") }}</option>
+                            <option value="web_form">{{ _("Web Form") }}</option>
+                            <option value="mobile_app">{{ _("Mobile App") }}</option>
+                            <option value="social_media">{{ _("Social Media")}}</option>
+                            <option value="fax">{{ _("Fax") }}</option>
+                            <option value="other">{{ _("Other")}}</option>
+                        </select>
+                    </div>
+                </div>
 
-                        <div class="mb-3">
-                            <label class="form-label">{% trans "Message" %} <span class="text-danger">*</span></label>
-                            <textarea name="message" class="form-control" rows="6" required></textarea>
-                        </div>
+                <!-- Due Date -->
+                <div class="mb-3">
+                    <label class="form-label">{% trans "Due Date" %}</label>
+                    <input type="datetime-local" name="due_date" class="form-control"
+                           placeholder="{% trans 'Optional due date' %}">
+                    <small class="form-text text-muted">
+                        {{ _("Leave empty for default based on priority")}}
+                    </small>
+                </div>
 
-                        <div class="d-flex justify-content-end">
-                            <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-secondary me-2">{% trans "Cancel" %}</a>
-                            <button type="submit" class="btn btn-primary">
-                                <i class="fas fa-save"></i> {% trans "Create Inquiry" %}
-                            </button>
-                        </div>
-                    </form>
+                <!-- Help Information -->
+                <div class="alert alert-info">
+                    <h6 class="alert-heading">
+                        <i class="bi bi-info-circle me-2"></i>{{ _("Help")}}
+                    </h6>
+                    <p class="mb-0 small">
+                        {{ _("Use this form to create a new inquiry from a patient or visitor.")}}
+                    </p>
+                    <hr class="my-2">
+                    <p class="mb-0 small">
+                        {{ _("If the inquiry is from a registered patient, search and select them. Otherwise, provide contact information.")}}
+                    </p>
+                    <p class="mb-0 small mt-2 text-muted">
+                        {{ _("Fields marked with * are required.")}}
+                    </p>
+                </div>
+
+                <!-- Action Buttons -->
+                <div class="d-grid gap-2">
+                    <button type="submit" class="btn btn-primary btn-lg">
+                        <i class="bi bi-check-circle me-2"></i>{{ _("Create Inquiry")}}
+                    </button>
+                    <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-outline-secondary">
+                        <i class="bi bi-x-circle me-2"></i>{{ _("Cancel") }}
+                    </a>
                 </div>
             </div>
         </div>
-
-        <div class="col-lg-4">
-            <div class="card">
-                <div class="card-header">
-                    <h6 class="m-0 font-weight-bold">{% trans "Help" %}</h6>
-                </div>
-                <div class="card-body">
-                    <p class="small">{% trans "Use this form to create a new inquiry from a patient or visitor." %}</p>
-                    <p class="small">{% trans "If the inquiry is from a registered patient, search and select them. Otherwise, provide contact information." %}</p>
-                    <p class="small text-muted">{% trans "Fields marked with * are required." %}</p>
-                </div>
-            </div>
-        </div>
-    </div>
+    </form>
 </div>
+{% endblock %}
 
+{% block extra_js %}
 <script>
 // Department loading
-document.getElementById('hospital-select').addEventListener('change', function() {
+document.getElementById('hospital-select')?.addEventListener('change', function() {
     const hospitalId = this.value;
     const departmentSelect = document.getElementById('department-select');
     
     if (!hospitalId) {
-        departmentSelect.innerHTML = '<option value="">{% trans "Select Department" %}</option>';
+        departmentSelect.innerHTML = '<option value="">{{ _("Select department")}}</option>';
         return;
     }
     
     fetch(`/complaints/ajax/departments/?hospital_id=${hospitalId}`)
         .then(response => response.json())
         .then(data => {
-            departmentSelect.innerHTML = '<option value="">{% trans "Select Department" %}</option>';
+            departmentSelect.innerHTML = '<option value="">{{ _("Select department")}}</option>';
             data.departments.forEach(dept => {
                 const option = document.createElement('option');
                 option.value = dept.id;
-                option.textContent = dept.name;
+                option.textContent = dept.name_en || dept.name;
                 departmentSelect.appendChild(option);
             });
-        });
+        })
+        .catch(error => console.error('Error loading departments:', error));
 });
 
-// Patient search
+// Patient search with debounce
 let searchTimeout;
-document.getElementById('patient-search').addEventListener('input', function() {
+document.getElementById('patient-search')?.addEventListener('input', function() {
     const query = this.value;
     const resultsDiv = document.getElementById('patient-results');
     
@@ -172,7 +287,7 @@ document.getElementById('patient-search').addEventListener('input', function() {
             .then(response => response.json())
             .then(data => {
                 if (data.patients.length === 0) {
-                    resultsDiv.innerHTML = '<div class="list-group-item">{% trans "No patients found" %}</div>';
+                    resultsDiv.innerHTML = `<div class="list-group-item">{{ _("No patients found")}}</div>`;
                     resultsDiv.style.display = 'block';
                     return;
                 }
@@ -184,7 +299,7 @@ document.getElementById('patient-search').addEventListener('input', function() {
                     item.className = 'list-group-item list-group-item-action';
                     item.innerHTML = `
                         <strong>${patient.name}</strong><br>
-                        <small>MRN: ${patient.mrn} | ${patient.phone || ''} | ${patient.email || ''}</small>
+                        <small>{{ _("MRN") }}: ${patient.mrn} | ${patient.phone || ''} | ${patient.email || ''}</small>
                     `;
                     item.addEventListener('click', function(e) {
                         e.preventDefault();
@@ -193,7 +308,8 @@ document.getElementById('patient-search').addEventListener('input', function() {
                     resultsDiv.appendChild(item);
                 });
                 resultsDiv.style.display = 'block';
-            });
+            })
+            .catch(error => console.error('Error searching patients:', error));
     }, 300);
 });
 
@@ -204,9 +320,9 @@ function selectPatient(patient) {
     
     const selectedDiv = document.getElementById('selected-patient');
     selectedDiv.innerHTML = `
-        <strong>{% trans "Selected Patient" %}:</strong> ${patient.name}<br>
-        <small>MRN: ${patient.mrn}</small>
-        <button type="button" class="btn btn-sm btn-link" onclick="clearPatient()">{% trans "Clear" %}</button>
+        <strong>{{ _("Selected Patient") }}:</strong> ${patient.name}<br>
+        <small>{{ _("MRN") }}: ${patient.mrn}</small>
+        <button type="button" class="btn btn-sm btn-link" onclick="clearPatient()">{{ _("Clear") }}</button>
     `;
     selectedDiv.style.display = 'block';
 }
@@ -215,5 +331,15 @@ function clearPatient() {
     document.getElementById('patient-id').value = '';
     document.getElementById('selected-patient').style.display = 'none';
 }
+
+// Form validation
+const form = document.getElementById('inquiryForm');
+form?.addEventListener('submit', function(e) {
+    if (!form.checkValidity()) {
+        e.preventDefault();
+        e.stopPropagation();
+    }
+    form.classList.add('was-validated');
+});
 </script>
 {% endblock %}
diff --git a/templates/complaints/inquiry_list.html b/templates/complaints/inquiry_list.html
index 744b0fb..08c9e37 100644
--- a/templates/complaints/inquiry_list.html
+++ b/templates/complaints/inquiry_list.html
@@ -1,19 +1,95 @@
 {% extends 'layouts/base.html' %}
 {% load i18n %}
+{% load static %}
 
-{% block title %}{% trans "Inquiries" %}{% endblock %}
+{% block title %}{{ _("Inquiries Console")}} - PX360{% endblock %}
+
+{% block extra_css %}
+<style>
+    .filter-panel {
+        background: #f8f9fa;
+        border: 1px solid #dee2e6;
+        border-radius: 8px;
+        padding: 20px;
+        margin-bottom: 20px;
+    }
+    .filter-panel.collapsed {
+        padding: 10px 20px;
+    }
+    .filter-panel.collapsed .filter-body {
+        display: none;
+    }
+    .table-toolbar {
+        background: #fff;
+        border: 1px solid #dee2e6;
+        border-radius: 8px;
+        padding: 15px;
+        margin-bottom: 15px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .status-badge {
+        padding: 4px 12px;
+        border-radius: 12px;
+        font-size: 0.85rem;
+        font-weight: 500;
+    }
+    .status-open { background: #e3f2fd; color: #1976d2; }
+    .status-in_progress { background: #fff3e0; color: #f57c00; }
+    .status-resolved { background: #e8f5e9; color: #388e3c; }
+    .status-closed { background: #f5f5f5; color: #616161; }
+    
+    .priority-badge {
+        padding: 4px 12px;
+        border-radius: 12px;
+        font-size: 0.85rem;
+        font-weight: 500;
+    }
+    .priority-low { background: #e8f5e9; color: #388e3c; }
+    .priority-medium { background: #fff3e0; color: #f57c00; }
+    .priority-high { background: #ffebee; color: #d32f2f; }
+    .priority-urgent { background: #880e4f; color: #fff; }
+    
+    .overdue-badge {
+        background: #d32f2f;
+        color: white;
+        padding: 2px 8px;
+        border-radius: 10px;
+        font-size: 0.75rem;
+        font-weight: 600;
+        margin-left: 8px;
+    }
+    
+    .inquiry-row:hover {
+        background: #f8f9fa;
+        cursor: pointer;
+    }
+    
+    .stat-card {
+        border-left: 4px solid;
+        transition: transform 0.2s;
+    }
+    .stat-card:hover {
+        transform: translateY(-2px);
+    }
+</style>
+{% endblock %}
 
 {% block content %}
 <div class="container-fluid">
     <!-- Page Header -->
     <div class="d-flex justify-content-between align-items-center mb-4">
         <div>
-            <h1 class="h3 mb-0">{% trans "Inquiries" %}</h1>
-            <p class="text-muted">{% trans "Manage patient inquiries and requests" %}</p>
+            <h2 class="mb-1">
+                <i class="bi bi-question-circle-fill text-info me-2"></i>
+                {{ _("Inquiries Console")}}
+            </h2>
+            <p class="text-muted mb-0">{{ _("Manage patient inquiries and requests")}}</p>
         </div>
         <div>
             <a href="{% url 'complaints:inquiry_create' %}" class="btn btn-primary">
-                <i class="fas fa-plus"></i> {% trans "New Inquiry" %}
+                <i class="bi bi-plus-circle me-1"></i> {{ _("New Inquiry")}}
             </a>
         </div>
     </div>
@@ -21,176 +97,375 @@
     <!-- Statistics Cards -->
     <div class="row mb-4">
         <div class="col-md-3">
-            <div class="card border-left-primary">
+            <div class="card stat-card border-primary">
                 <div class="card-body">
-                    <div class="text-xs font-weight-bold text-primary text-uppercase mb-1">{% trans "Total" %}</div>
-                    <div class="h5 mb-0 font-weight-bold">{{ stats.total }}</div>
+                    <div class="d-flex justify-content-between align-items-center">
+                        <div>
+                            <h6 class="text-muted mb-1">{% trans "Total Inquiries" %}</h6>
+                            <h3 class="mb-0">{{ stats.total }}</h3>
+                        </div>
+                        <div class="text-primary">
+                            <i class="bi bi-list-ul" style="font-size: 2rem;"></i>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
         <div class="col-md-3">
-            <div class="card border-left-warning">
+            <div class="card stat-card border-info">
                 <div class="card-body">
-                    <div class="text-xs font-weight-bold text-warning text-uppercase mb-1">{% trans "Open" %}</div>
-                    <div class="h5 mb-0 font-weight-bold">{{ stats.open }}</div>
+                    <div class="d-flex justify-content-between align-items-center">
+                        <div>
+                            <h6 class="text-muted mb-1">{% trans "Open" %}</h6>
+                            <h3 class="mb-0">{{ stats.open }}</h3>
+                        </div>
+                        <div class="text-info">
+                            <i class="bi bi-folder2-open" style="font-size: 2rem;"></i>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
         <div class="col-md-3">
-            <div class="card border-left-info">
+            <div class="card stat-card border-warning">
                 <div class="card-body">
-                    <div class="text-xs font-weight-bold text-info text-uppercase mb-1">{% trans "In Progress" %}</div>
-                    <div class="h5 mb-0 font-weight-bold">{{ stats.in_progress }}</div>
+                    <div class="d-flex justify-content-between align-items-center">
+                        <div>
+                            <h6 class="text-muted mb-1">{% trans "In Progress" %}</h6>
+                            <h3 class="mb-0">{{ stats.in_progress }}</h3>
+                        </div>
+                        <div class="text-warning">
+                            <i class="bi bi-hourglass-split" style="font-size: 2rem;"></i>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
         <div class="col-md-3">
-            <div class="card border-left-success">
+            <div class="card stat-card border-success">
                 <div class="card-body">
-                    <div class="text-xs font-weight-bold text-success text-uppercase mb-1">{% trans "Resolved" %}</div>
-                    <div class="h5 mb-0 font-weight-bold">{{ stats.resolved }}</div>
+                    <div class="d-flex justify-content-between align-items-center">
+                        <div>
+                            <h6 class="text-muted mb-1">{% trans "Resolved" %}</h6>
+                            <h3 class="mb-0 text-success">{{ stats.resolved }}</h3>
+                        </div>
+                        <div class="text-success">
+                            <i class="bi bi-check-circle-fill" style="font-size: 2rem;"></i>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
 
-    <!-- Filters -->
-    <div class="card mb-4">
-        <div class="card-header">
-            <h6 class="m-0 font-weight-bold">{% trans "Filters" %}</h6>
+    <!-- Filter Panel -->
+    <div class="filter-panel" id="filterPanel">
+        <div class="d-flex justify-content-between align-items-center mb-3">
+            <h5 class="mb-0">
+                <i class="bi bi-funnel me-2"></i>{{ _("Filters") }}
+            </h5>
+            <button class="btn btn-sm btn-outline-secondary" onclick="toggleFilters()">
+                <i class="bi bi-chevron-up" id="filterToggleIcon"></i>
+            </button>
         </div>
-        <div class="card-body">
-            <form method="get" class="row g-3">
-                <div class="col-md-3">
-                    <label class="form-label">{% trans "Search" %}</label>
-                    <input type="text" name="search" class="form-control" value="{{ filters.search }}" placeholder="{% trans 'Subject, contact name...' %}">
+        
+        <div class="filter-body">
+            <form method="get" action="{% url 'complaints:inquiry_list' %}" id="filterForm">
+                <div class="row g-3">
+                    <!-- Search -->
+                    <div class="col-md-4">
+                        <label class="form-label">{% trans "Search" %}</label>
+                        <input type="text" class="form-control" name="search" 
+                               placeholder="{% trans 'Subject, contact name...' %}" 
+                               value="{{ filters.search }}">
+                    </div>
+                    
+                    <!-- Status -->
+                    <div class="col-md-4">
+                        <label class="form-label">{% trans "Status" %}</label>
+                        <select class="form-select" name="status">
+                            <option value="">{{ _("All Statuses")}}</option>
+                            {% for value, label in status_choices %}
+                            <option value="{{ value }}" {% if filters.status == value %}selected{% endif %}>
+                                {{ label }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    
+                    <!-- Priority -->
+                    <div class="col-md-4">
+                        <label class="form-label">{% trans "Priority" %}</label>
+                        <select class="form-select" name="priority">
+                            <option value="">{{ _("All Priorities")}}</option>
+                            <option value="low" {% if filters.priority == 'low' %}selected{% endif %}>{{ _("Low") }}</option>
+                            <option value="medium" {% if filters.priority == 'medium' %}selected{% endif %}>{{ _("Medium") }}</option>
+                            <option value="high" {% if filters.priority == 'high' %}selected{% endif %}>{{ _("High") }}</option>
+                            <option value="urgent" {% if filters.priority == 'urgent' %}selected{% endif %}>{{ _("Urgent") }}</option>
+                        </select>
+                    </div>
+                    
+                    <!-- Category -->
+                    <div class="col-md-4">
+                        <label class="form-label">{% trans "Category" %}</label>
+                        <select class="form-select" name="category">
+                            <option value="">{{ _("All Categories")}}</option>
+                            <option value="appointment" {% if filters.category == 'appointment' %}selected{% endif %}>{{ _("Appointment")}}</option>
+                            <option value="billing" {% if filters.category == 'billing' %}selected{% endif %}>{{ _("Billing") }}</option>
+                            <option value="medical_records" {% if filters.category == 'medical_records' %}selected{% endif %}>{{ _("Medical Records")}}</option>
+                            <option value="pharmacy" {% if filters.category == 'pharmacy' %}selected{% endif %}>{{ _("Pharmacy")}}</option>
+                            <option value="insurance" {% if filters.category == 'insurance' %}selected{% endif %}>{{ _("Insurance")}}</option>
+                            <option value="feedback" {% if filters.category == 'feedback' %}selected{% endif %}>{{ _("Feedback")}}</option>
+                            <option value="general" {% if filters.category == 'general' %}selected{% endif %}>{{ _("General")}}</option>
+                            <option value="other" {% if filters.category == 'other' %}selected{% endif %}>{{ _("Other") }}</option>
+                        </select>
+                    </div>
+                    
+                    <!-- Hospital -->
+                    <div class="col-md-4">
+                        <label class="form-label">{% trans "Hospital" %}</label>
+                        <select class="form-select" name="hospital">
+                            <option value="">{{ _("All Hospitals")}}</option>
+                            {% for hospital in hospitals %}
+                            <option value="{{ hospital.id }}" {% if filters.hospital == hospital.id|stringformat:"s" %}selected{% endif %}>
+                                {{ hospital.name_en }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    
+                    <!-- Assigned To -->
+                    <div class="col-md-4">
+                        <label class="form-label">{% trans "Assigned To" %}</label>
+                        <select class="form-select" name="assigned_to">
+                            <option value="">{{ _("All Users")}}</option>
+                            {% for user_obj in assignable_users %}
+                            <option value="{{ user_obj.id }}" {% if filters.assigned_to == user_obj.id|stringformat:"s" %}selected{% endif %}>
+                                {{ user_obj.get_full_name }}
+                            </option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    
+                    <!-- Date Range -->
+                    <div class="col-md-3">
+                        <label class="form-label">{% trans "Date From" %}</label>
+                        <input type="date" class="form-control" name="date_from" value="{{ filters.date_from }}">
+                    </div>
+                    <div class="col-md-3">
+                        <label class="form-label">{% trans "Date To" %}</label>
+                        <input type="date" class="form-control" name="date_to" value="{{ filters.date_to }}">
+                    </div>
                 </div>
-                <div class="col-md-2">
-                    <label class="form-label">{% trans "Status" %}</label>
-                    <select name="status" class="form-select">
-                        <option value="">{% trans "All" %}</option>
-                        <option value="open" {% if filters.status == 'open' %}selected{% endif %}>{% trans "Open" %}</option>
-                        <option value="in_progress" {% if filters.status == 'in_progress' %}selected{% endif %}>{% trans "In Progress" %}</option>
-                        <option value="resolved" {% if filters.status == 'resolved' %}selected{% endif %}>{% trans "Resolved" %}</option>
-                        <option value="closed" {% if filters.status == 'closed' %}selected{% endif %}>{% trans "Closed" %}</option>
-                    </select>
-                </div>
-                <div class="col-md-2">
-                    <label class="form-label">{% trans "Category" %}</label>
-                    <select name="category" class="form-select">
-                        <option value="">{% trans "All" %}</option>
-                        <option value="appointment" {% if filters.category == 'appointment' %}selected{% endif %}>{% trans "Appointment" %}</option>
-                        <option value="billing" {% if filters.category == 'billing' %}selected{% endif %}>{% trans "Billing" %}</option>
-                        <option value="medical_records" {% if filters.category == 'medical_records' %}selected{% endif %}>{% trans "Medical Records" %}</option>
-                        <option value="general" {% if filters.category == 'general' %}selected{% endif %}>{% trans "General" %}</option>
-                        <option value="other" {% if filters.category == 'other' %}selected{% endif %}>{% trans "Other" %}</option>
-                    </select>
-                </div>
-                <div class="col-md-3">
-                    <label class="form-label">{% trans "Hospital" %}</label>
-                    <select name="hospital" class="form-select">
-                        <option value="">{% trans "All" %}</option>
-                        {% for hospital in hospitals %}
-                        <option value="{{ hospital.id }}" {% if filters.hospital == hospital.id|stringformat:"s" %}selected{% endif %}>{{ hospital.name }}</option>
-                        {% endfor %}
-                    </select>
-                </div>
-                <div class="col-md-2 d-flex align-items-end">
-                    <button type="submit" class="btn btn-primary me-2">{% trans "Apply" %}</button>
-                    <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-secondary">{% trans "Clear" %}</a>
+                
+                <div class="mt-3 d-flex gap-2">
+                    <button type="submit" class="btn btn-primary">
+                        <i class="bi bi-search me-1"></i> {{ _("Apply Filters")}}
+                    </button>
+                    <a href="{% url 'complaints:inquiry_list' %}" class="btn btn-outline-secondary">
+                        <i class="bi bi-x-circle me-1"></i> {{ _("Clear") }}
+                    </a>
                 </div>
             </form>
         </div>
     </div>
 
+    <!-- Table Toolbar -->
+    <div class="table-toolbar">
+        <div>
+            <span class="text-muted">
+                Showing {{ page_obj.start_index }} to {{ page_obj.end_index }} of {{ page_obj.paginator.count }} inquiries
+            </span>
+        </div>
+        <div class="d-flex gap-2">
+            <button class="btn btn-sm btn-outline-primary" onclick="exportData('csv')">
+                <i class="bi bi-file-earmark-spreadsheet me-1"></i> {{ _("Export CSV")}}
+            </button>
+            <button class="btn btn-sm btn-outline-primary" onclick="exportData('excel')">
+                <i class="bi bi-file-earmark-excel me-1"></i> {{ _("Export Excel")}}
+            </button>
+        </div>
+    </div>
+
     <!-- Inquiries Table -->
     <div class="card">
-        <div class="card-header">
-            <h6 class="m-0 font-weight-bold">{% trans "Inquiries List" %}</h6>
-        </div>
-        <div class="card-body">
+        <div class="card-body p-0">
             <div class="table-responsive">
-                <table class="table table-hover">
-                    <thead>
+                <table class="table table-hover mb-0">
+                    <thead class="table-light">
                         <tr>
+                            <th style="width: 50px;">
+                                <input type="checkbox" class="form-check-input" id="selectAll">
+                            </th>
                             <th>{% trans "ID" %}</th>
                             <th>{% trans "Subject" %}</th>
                             <th>{% trans "Contact" %}</th>
                             <th>{% trans "Category" %}</th>
                             <th>{% trans "Status" %}</th>
+                            <th>{% trans "Priority" %}</th>
                             <th>{% trans "Hospital" %}</th>
+                            <th>{% trans "Assigned To" %}</th>
+                            <th>{% trans "Due Date" %}</th>
                             <th>{% trans "Created" %}</th>
                             <th>{% trans "Actions" %}</th>
                         </tr>
                     </thead>
                     <tbody>
                         {% for inquiry in inquiries %}
-                        <tr>
-                            <td><small class="text-muted">{{ inquiry.id|truncatechars:8 }}</small></td>
+                        <tr class="inquiry-row" onclick="window.location='{% url 'complaints:inquiry_detail' inquiry.id %}'">
+                            <td onclick="event.stopPropagation();">
+                                <input type="checkbox" class="form-check-input inquiry-checkbox" 
+                                       value="{{ inquiry.id }}">
+                            </td>
                             <td>
-                                <a href="{% url 'complaints:inquiry_detail' inquiry.id %}">{{ inquiry.subject }}</a>
+                                <small class="text-muted">#{{ inquiry.id|slice:":8" }}</small>
+                            </td>
+                            <td>
+                                <div class="d-flex align-items-center">
+                                    {{ inquiry.subject|truncatewords:8 }}
+                                    {% if inquiry.is_overdue %}
+                                    <span class="overdue-badge">{{ _("OVERDUE") }}</span>
+                                    {% endif %}
+                                </div>
                             </td>
                             <td>
                                 {% if inquiry.patient %}
-                                    {{ inquiry.patient.get_full_name }}
+                                    <strong>{{ inquiry.patient.get_full_name }}</strong><br>
+                                    <small class="text-muted">{{ _("MRN") }}: {{ inquiry.patient.mrn }}</small>
                                 {% else %}
-                                    {{ inquiry.contact_name|default:inquiry.contact_email }}
+                                    <strong>{{ inquiry.contact_name|default:inquiry.contact_email }}</strong><br>
+                                    <small class="text-muted">{{ inquiry.contact_email }}</small>
                                 {% endif %}
                             </td>
-                            <td><span class="badge bg-secondary">{{ inquiry.get_category_display }}</span></td>
                             <td>
-                                {% if inquiry.status == 'open' %}
-                                    <span class="badge bg-warning">{% trans "Open" %}</span>
-                                {% elif inquiry.status == 'in_progress' %}
-                                    <span class="badge bg-info">{% trans "In Progress" %}</span>
-                                {% elif inquiry.status == 'resolved' %}
-                                    <span class="badge bg-success">{% trans "Resolved" %}</span>
+                                <span class="badge bg-secondary">{{ inquiry.get_category_display }}</span>
+                            </td>
+                            <td>
+                                <span class="status-badge status-{{ inquiry.status }}">
+                                    {{ inquiry.get_status_display }}
+                                </span>
+                            </td>
+                            <td>
+                                {% if inquiry.priority %}
+                                <span class="priority-badge priority-{{ inquiry.priority }}">
+                                    {{ inquiry.get_priority_display }}
+                                </span>
                                 {% else %}
-                                    <span class="badge bg-secondary">{{ inquiry.get_status_display }}</span>
+                                <span class="text-muted"><em>-</em></span>
                                 {% endif %}
                             </td>
-                            <td>{{ inquiry.hospital.name }}</td>
-                            <td>{{ inquiry.created_at|date:"Y-m-d H:i" }}</td>
                             <td>
-                                <a href="{% url 'complaints:inquiry_detail' inquiry.id %}" class="btn btn-sm btn-primary">
-                                    <i class="fas fa-eye"></i>
-                                </a>
+                                <small>{{ inquiry.hospital.name_en|truncatewords:3 }}</small>
+                            </td>
+                            <td>
+                                {% if inquiry.assigned_to %}
+                                <small>{{ inquiry.assigned_to.get_full_name }}</small>
+                                {% else %}
+                                <span class="text-muted"><em>{{ _("Unassigned") }}</em></span>
+                                {% endif %}
+                            </td>
+                            <td>
+                                {% if inquiry.due_date %}
+                                <small class="{% if inquiry.is_overdue %}text-danger fw-bold{% endif %}">
+                                    {{ inquiry.due_date|date:"M d, Y H:i" }}
+                                </small>
+                                {% else %}
+                                <span class="text-muted"><em>-</em></span>
+                                {% endif %}
+                            </td>
+                            <td>
+                                <small class="text-muted">{{ inquiry.created_at|date:"M d, Y" }}</small>
+                            </td>
+                            <td onclick="event.stopPropagation();">
+                                <div class="btn-group btn-group-sm">
+                                    <a href="{% url 'complaints:inquiry_detail' inquiry.id %}" 
+                                       class="btn btn-outline-primary" title="{% trans 'View' %}">
+                                        <i class="bi bi-eye"></i>
+                                    </a>
+                                </div>
                             </td>
                         </tr>
                         {% empty %}
                         <tr>
-                            <td colspan="8" class="text-center text-muted">{% trans "No inquiries found" %}</td>
+                            <td colspan="12" class="text-center py-5">
+                                <i class="bi bi-inbox" style="font-size: 3rem; color: #ccc;"></i>
+                                <p class="text-muted mt-3">{{ _("No inquiries found")}}</p>
+                            </td>
                         </tr>
                         {% endfor %}
                     </tbody>
                 </table>
             </div>
-
-            <!-- Pagination -->
-            {% if page_obj.has_other_pages %}
-            <nav aria-label="Page navigation">
-                <ul class="pagination justify-content-center">
-                    {% if page_obj.has_previous %}
-                    <li class="page-item">
-                        <a class="page-link" href="?page={{ page_obj.previous_page_number }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">{% trans "Previous" %}</a>
-                    </li>
-                    {% endif %}
-                    
-                    {% for num in page_obj.paginator.page_range %}
-                    <li class="page-item {% if page_obj.number == num %}active{% endif %}">
-                        <a class="page-link" href="?page={{ num }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">{{ num }}</a>
-                    </li>
-                    {% endfor %}
-                    
-                    {% if page_obj.has_next %}
-                    <li class="page-item">
-                        <a class="page-link" href="?page={{ page_obj.next_page_number }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">{% trans "Next" %}</a>
-                    </li>
-                    {% endif %}
-                </ul>
-            </nav>
-            {% endif %}
         </div>
     </div>
+
+    <!-- Pagination -->
+    {% if page_obj.has_other_pages %}
+    <nav aria-label="Inquiries pagination" class="mt-4">
+        <ul class="pagination justify-content-center">
+            {% if page_obj.has_previous %}
+            <li class="page-item">
+                <a class="page-link" href="?page=1{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">
+                    <i class="bi bi-chevron-double-left"></i>
+                </a>
+            </li>
+            <li class="page-item">
+                <a class="page-link" href="?page={{ page_obj.previous_page_number }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">
+                    <i class="bi bi-chevron-left"></i>
+                </a>
+            </li>
+            {% endif %}
+            
+            {% for num in page_obj.paginator.page_range %}
+                {% if page_obj.number == num %}
+                <li class="page-item active"><span class="page-link">{{ num }}</span></li>
+                {% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %}
+                <li class="page-item">
+                    <a class="page-link" href="?page={{ num }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">
+                        {{ num }}
+                    </a>
+                </li>
+                {% endif %}
+            {% endfor %}
+            
+            {% if page_obj.has_next %}
+            <li class="page-item">
+                <a class="page-link" href="?page={{ page_obj.next_page_number }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">
+                    <i class="bi bi-chevron-right"></i>
+                </a>
+            </li>
+            <li class="page-item">
+                <a class="page-link" href="?page={{ page_obj.paginator.num_pages }}{% for key, value in filters.items %}&{{ key }}={{ value }}{% endfor %}">
+                    <i class="bi bi-chevron-double-right"></i>
+                </a>
+            </li>
+            {% endif %}
+        </ul>
+    </nav>
+    {% endif %}
 </div>
 {% endblock %}
+
+{% block extra_js %}
+<script>
+function toggleFilters() {
+    const panel = document.getElementById('filterPanel');
+    const icon = document.getElementById('filterToggleIcon');
+    panel.classList.toggle('collapsed');
+    icon.classList.toggle('bi-chevron-up');
+    icon.classList.toggle('bi-chevron-down');
+}
+
+function exportData(format) {
+    const params = new URLSearchParams(window.location.search);
+    params.set('export', format);
+    window.location.href = '{% url "complaints:inquiry_list" %}?' + params.toString();
+}
+
+// Select all checkbox
+document.getElementById('selectAll')?.addEventListener('change', function() {
+    const checkboxes = document.querySelectorAll('.inquiry-checkbox');
+    checkboxes.forEach(cb => cb.checked = this.checked);
+});
+</script>
+{% endblock %}