diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2b7f59f8..37d3d2d9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -30,7 +30,7 @@ android {
 
     signingConfigs {
         release {
-            storeFile file('/Users/mohamedmekawy/Documents/Work/DoctorApp/android/doctor_app_key')
+            storeFile file('../doctor_app_key')
             storePassword 'Hmgdoctor1234'
             keyAlias 'hmgdoctor'
             keyPassword 'Hmgdoctor1234'
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 98984cbc..1eeef6c9 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -7,9 +7,9 @@ const ONLY_DATE = "[0-9/]";
 const BASE_URL_LIVE_CARE = 'https://livecare.hmg.com/';
 const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
 // const BASE_URL_LIVE_CARE = 'https://livecareuat.hmg.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
 
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
 
 // const BASE_URL = 'https://webservices.hmg.com/';
 
diff --git a/lib/core/model/pharmacy-intervention-model/pharmacy_intervention_item.dart b/lib/core/model/pharmacy-intervention-model/pharmacy_intervention_item.dart
index f0eb948b..d7d34f00 100644
--- a/lib/core/model/pharmacy-intervention-model/pharmacy_intervention_item.dart
+++ b/lib/core/model/pharmacy-intervention-model/pharmacy_intervention_item.dart
@@ -14,8 +14,6 @@ class MedicationList{
 class Medication {
   int? accessLevel;
   int? admissionNo;
-  String? authorizedBy;
-  String? authorizedByName;
   String? createdBy;
   String? doctorComments;
   String? doctorName;
@@ -38,8 +36,6 @@ class Medication {
   Medication({
     this.accessLevel,
     this.admissionNo,
-    this.authorizedBy,
-    this.authorizedByName,
     this.createdBy,
     this.doctorComments,
     this.doctorName,
@@ -60,58 +56,9 @@ class Medication {
     this.accessLevelDescription,
   });
 
-  dynamic? getValue(int index){
-    switch (index) {
-      case 0:
-        return this.accessLevel;
-      case 1:
-       return this.patientID;
-        break;
-      case 2:
-        return this.patientName;
-        break;
-      case 3:
-        return this.nursingStation;
-        break;
-      case 4:
-        return this.admissionNo;
-        break;
-      case 5:
-        return this.medication;
-        break;
-      case 6:
-        return this.dosageDetail;
-        break;
-      case 7:
-        return this.doctorComments;
-        break;
-      case 8:
-        return this.startDatetime;
-        break;
-      case 9:
-        return this.stopDatetime;
-        break;
-      case 10:
-        return this.status;
-        break;
-      case 11:
-        return this.doctorName;
-        break;
-      case 12:
-        return this.authorizedBy;
-        break;
-      case 13:
-        return this.pharmacyRemarks;
-        break;
-    }
-    return index;
-  }
-
   factory Medication.fromJson(Map<String, dynamic> json) {
     return Medication(
       admissionNo: json['admissionNo']?? '',
-      authorizedBy: json['authorizedby']?? '-',
-      authorizedByName: json['authorizedbyName']?? '',
       createdBy: json['createdBy']?? '',
       doctorComments: json['doctorComments']?? '',
       doctorName: json['doctorName']?? '',
@@ -137,8 +84,6 @@ class Medication {
     return {
       'accessLevel': accessLevel,
       'admissionNo': admissionNo,
-      'authorizedby': authorizedBy,
-      'authorizedbyName': authorizedByName,
       'createdBy': createdBy,
       'doctorComments': doctorComments,
       'doctorName': doctorName,
diff --git a/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart b/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart
index e2fe3512..fc79a0b2 100644
--- a/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart
+++ b/lib/screens/pharmacy_intervention/widgets/InterventionCardBody.dart
@@ -152,22 +152,18 @@ class InterventionCardBody extends StatelessWidget {
           height: 10,
         ),
         Row(
+          mainAxisSize: MainAxisSize.max,
+          mainAxisAlignment: MainAxisAlignment.start,
           children: [
             Expanded(
               child: InterventionDetails(
                 title: TranslationBase
                     .of(context)
-                    .authorizedBy,
-                data: medication.authorizedBy.toString() ?? '-',
+                    .pharmacyRemarks,
+                data: medication.pharmacyRemarks.toString() ?? '-',
               ),
             ),
-            Expanded(
-                child: InterventionDetails(
-                  title: TranslationBase
-                      .of(context)
-                      .pharmacyRemarks,
-                  data: medication.pharmacyRemarks.toString() ?? '-',
-                ))
+            Expanded(child: SizedBox.shrink())
           ],
         ),
         SizedBox(
diff --git a/pubspec.lock b/pubspec.lock
index c92984e9..c485105b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -345,22 +345,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
-  device_info:
-    dependency: "direct main"
-    description:
-      name: device_info
-      sha256: f4a8156cb7b7480d969cb734907d18b333c8f0bc0b1ad0b342cdcecf30d62c48
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  device_info_platform_interface:
-    dependency: transitive
-    description:
-      name: device_info_platform_interface
-      sha256: b148e0bf9640145d09a4f8dea96614076f889e7f7f8b5ecab1c7e5c2dbc73c1b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
   dropdown_search:
     dependency: "direct main"
     description: