diff --git a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
index 0ce34e42..7f0d0c5c 100644
--- a/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
+++ b/lib/pages/AlHabibMedicalService/health_calculator/body_fat/body_fat.dart
@@ -45,6 +45,10 @@ class _BodyFatState extends State<BodyFat> {
   String dropdownValue;
   double calories = 0;
   String textResult = '';
+  TextEditingController heightController = TextEditingController();
+  TextEditingController neckController = TextEditingController();
+  TextEditingController waistController = TextEditingController();
+  TextEditingController hipController = TextEditingController();
 
   void updateColorHeight(int type) {
     //MG/DLT card
@@ -310,7 +314,18 @@ class _BodyFatState extends State<BodyFat> {
                                         children: <Widget>[
                                           Expanded(
                                             child: Center(
-                                              child: Text(heightCm.toString()),
+                                              child: Padding(
+                                                padding: const EdgeInsets.only(left: 10.0),
+                                                child: TextFormField(
+                                                  keyboardType: TextInputType.number,
+                                                  controller: heightController,
+                                                  decoration: InputDecoration(
+                                                      labelText: heightCm.toString(),
+                                                      labelStyle: TextStyle(
+                                                        color: Colors.black,
+                                                      )),
+                                                ),
+                                              ),
                                             ),
                                           ),
                                           Container(
@@ -476,7 +491,18 @@ class _BodyFatState extends State<BodyFat> {
                                         children: <Widget>[
                                           Expanded(
                                             child: Center(
-                                              child: Text(neck.toString()),
+                                              child: Padding(
+                                                padding: const EdgeInsets.only(left: 10.0),
+                                                child: TextFormField(
+                                                  keyboardType: TextInputType.number,
+                                                  controller: neckController,
+                                                  decoration: InputDecoration(
+                                                      labelText: neck.toString(),
+                                                      labelStyle: TextStyle(
+                                                        color: Colors.black,
+                                                      )),
+                                                ),
+                                              ),
                                             ),
                                           ),
                                           Container(
@@ -642,7 +668,18 @@ class _BodyFatState extends State<BodyFat> {
                                         children: <Widget>[
                                           Expanded(
                                             child: Center(
-                                              child: Text(waist.toString()),
+                                              child: Padding(
+                                                padding: const EdgeInsets.only(left: 10.0),
+                                                child: TextFormField(
+                                                  keyboardType: TextInputType.number,
+                                                  controller: waistController,
+                                                  decoration: InputDecoration(
+                                                      labelText: waist.toString(),
+                                                      labelStyle: TextStyle(
+                                                        color: Colors.black,
+                                                      )),
+                                                ),
+                                              ),
                                             ),
                                           ),
                                           Container(
@@ -808,7 +845,18 @@ class _BodyFatState extends State<BodyFat> {
                                         children: <Widget>[
                                           Expanded(
                                             child: Center(
-                                              child: Text(hip.toString()),
+                                              child: Padding(
+                                                padding: const EdgeInsets.only(left: 10.0),
+                                                child: TextFormField(
+                                                  keyboardType: TextInputType.number,
+                                                  controller: hipController,
+                                                  decoration: InputDecoration(
+                                                      labelText: hip.toString(),
+                                                      labelStyle: TextStyle(
+                                                        color: Colors.black,
+                                                      )),
+                                                ),
+                                              ),
                                             ),
                                           ),
                                           Container(
diff --git a/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart b/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
index 7547bc4e..1b8f70e3 100644
--- a/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
+++ b/lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
@@ -144,7 +144,7 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
               ),
               InkWell(
                 onTap: () {
-                  confirmSelectMeasureTimeDialog(projectViewModel.isArabic ? measureTimeArList : measureTimeEnList);
+                  confirmSelectMeasureTimeDialog(projectViewModel.isArabic ? measureTimeEnList : measureTimeArList);
                 },
                 child: Container(
                   padding: EdgeInsets.all(12),
@@ -235,7 +235,8 @@ class _AddBloodPressurePageState extends State<AddBloodPressurePage> {
                   textColor: Colors.white,
                   color: isButtonDisabled ? Colors.grey[900] : Colors.grey,
                   onTap: () async {
-                    if (_bloodSystolicValueController.text.isNotEmpty && _bloodDiastolicValueController.text.isNotEmpty) {
+                    if (_bloodSystolicValueController.text.isNotEmpty &&
+                        _bloodDiastolicValueController.text.isNotEmpty) {
                       GifLoaderDialogUtils.showMyDialog(context);
 
                       widget.model
diff --git a/lib/pages/medical/reports/report_list_widget.dart b/lib/pages/medical/reports/report_list_widget.dart
index 922fb239..ece69c0f 100644
--- a/lib/pages/medical/reports/report_list_widget.dart
+++ b/lib/pages/medical/reports/report_list_widget.dart
@@ -60,23 +60,29 @@ class ReportListWidget extends StatelessWidget {
                               height: 12,
                             ),
                             Texts(reportList[index].projectName),
-                            Texts(reportList[index].clinicDescription),
+                            Container(
+                              //height: MediaQuery.of(context).size.height * 0.07,
+                              width: MediaQuery.of(context).size.width * 0.35,
+                              child: Texts(reportList[index].clinicDescription),
+                            ),
                             Texts(TranslationBase.of(context).invoiceNo + ': ${reportList[index].invoiceNo}'),
                             SizedBox(height: 12),
                           ],
                         ),
                         reportList[index].status == 2
-                            ? Container(
-                                margin: EdgeInsets.only(left: 15.0, right: 15.0),
-                                child: InkWell(
-                                  onTap: () {
-                                    showConfirmMessage(reportList[index]);
-                                    // sendReportEmail(reportList[index]);
-                                  },
-                                  child: Icon(
-                                    Icons.email,
-                                    color: Theme.of(context).primaryColor,
-                                    size: 30.0,
+                            ? Expanded(
+                                child: Container(
+                                  margin: EdgeInsets.only(left: 15.0, right: 15.0),
+                                  child: InkWell(
+                                    onTap: () {
+                                      showConfirmMessage(reportList[index]);
+                                      // sendReportEmail(reportList[index]);
+                                    },
+                                    child: Icon(
+                                      Icons.email,
+                                      color: Theme.of(context).primaryColor,
+                                      size: 30.0,
+                                    ),
                                   ),
                                 ),
                               )