diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 4225ed6e..116cab42 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -1129,7 +1129,7 @@ const Map<String, Map<String, String>> localizedValues = {
   "VTE_Type": {"en": "VTE Type", "ar": "VTE Type"},
   "pharmacology": {"en": "Pharmacology", "ar": "علم العقاقير"},
   "reasonsThrombo": {"en": "Reasons Thrombo", "ar": "أسباب ثرومبو"},
-  "youDoNotHaveFavoritePrescription": {"en": "You Don't Have Favorite Prescription", "ar": "ليس لديك وصفة طبية مفضلة"},
+  "youDoNotHaveFavoriteTemplate": {"en": "You Don't Have Favorite Template", "ar": "ليس لديك وصفة طبية مفضلة"},
   "pleaseSelectItem": {"en": "please Select Item", "ar": "الرجاء اختيار عنصر"},
   "searchFavoriteTemplate": {"en": "search Favorites Template", "ar": "البحث في قالب المفضلة"},
   "sorryNoMatch": {"en": "Sorry No Match", "ar": "عذرا لا يوجد تطابق"},
diff --git a/lib/core/viewModel/dashboard_view_model.dart b/lib/core/viewModel/dashboard_view_model.dart
index 0343eaa4..9ae198f3 100644
--- a/lib/core/viewModel/dashboard_view_model.dart
+++ b/lib/core/viewModel/dashboard_view_model.dart
@@ -59,7 +59,8 @@ class DashboardViewModel extends BaseViewModel {
     _firebaseMessaging.getToken().then((String token) async {
       if (token != '') {
         // DEVICE_TOKEN = token;
-        authProvider.insertDeviceImei(token);
+        ///TODO Elham* return it back
+        //  authProvider.insertDeviceImei(token);
       }
     });
   }
diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart
index 5978dcf7..12b54a3c 100644
--- a/lib/screens/patients/profile/radiology/radiology_home_page.dart
+++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart
@@ -96,6 +96,7 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
                   },
                   label: TranslationBase.of(context).applyForRadiologyOrder,
                 ),
+              ///TODO Elham * fix this to be list view builder
               ...List.generate(
                   model.radiologyList.length,
                   (index) => Container(
diff --git a/lib/screens/procedures/add_procedure_page.dart b/lib/screens/procedures/add_procedure_page.dart
index a82eaafa..83f4f6c6 100644
--- a/lib/screens/procedures/add_procedure_page.dart
+++ b/lib/screens/procedures/add_procedure_page.dart
@@ -185,7 +185,7 @@ class _AddProcedurePageState extends State<AddProcedurePage> {
             ],
           ),
         ),
-        bottomSheet: model.state == ViewState.BusyLocal
+        bottomSheet: model.state == ViewState.BusyLocal || entityList.isEmpty
             ? Container(
                 height: 0,
               )
diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart
index b5a798fe..3a3f6b09 100644
--- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart
+++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart
@@ -1,6 +1,7 @@
 import 'package:doctor_app_flutter/core/model/procedure/categories_procedure.dart';
 import 'package:doctor_app_flutter/core/viewModel/procedure_View_model.dart';
 import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart';
+import 'package:doctor_app_flutter/utils/utils.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/divider_with_spaces_around.dart';
 import 'package:doctor_app_flutter/widgets/shared/network_base_view.dart';
@@ -117,7 +118,7 @@ class _EntityListCheckboxSearchWidgetState
                                             padding: const EdgeInsets.symmetric(
                                                 horizontal: 10, vertical: 0),
                                             child: AppText(
-                                                historyInfo.procedureName,
+                                                 Utils.convertToTitleCase( historyInfo.procedureName),
                                                 fontSize: 14.0,
                                                 variant: "bodyText",
                                                 bold: true,
diff --git a/lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart b/lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
index ad689e93..f69f2c35 100644
--- a/lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
+++ b/lib/screens/procedures/favorite_procedure/add_favourite_procedure.dart
@@ -78,10 +78,10 @@ class _AddFavouriteProcedureState extends State<AddFavouriteProcedure> {
                       )
                     : ErrorMessage(
                         error: TranslationBase.of(context)
-                            .youDoNotHaveFavoritePrescription,
+                            .youDoNotHaveFavoriteTemplate,
                       ),
               ]),
-              bottomSheet: CustomBottomSheetContainer(
+              bottomSheet: widget.previousProcedureViewModel.templateList.length == 0?Container(height: 0,):CustomBottomSheetContainer(
                   label: widget.procedureType.getAddButtonTitle(context) ??
                       TranslationBase.of(context).addSelectedProcedures,
                   onTap: () async {
diff --git a/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart b/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
index fa1f880d..4f85827d 100644
--- a/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
+++ b/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
@@ -190,6 +190,7 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
             ),
           ),
         ),
+        ///TODO Elham* use our custom bottomsheet
         bottomSheet: Container(
           margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
           child: Wrap(
diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart
index e433df63..3ffef41d 100644
--- a/lib/utils/translations_delegate_base_utils.dart
+++ b/lib/utils/translations_delegate_base_utils.dart
@@ -1698,7 +1698,7 @@ class TranslationBase {
 
   String get reasonsThrombo => localizedValues['reasonsThrombo'][locale.languageCode];
 
-  String get youDoNotHaveFavoritePrescription => localizedValues['youDoNotHaveFavoritePrescription'][locale.languageCode];
+  String get youDoNotHaveFavoriteTemplate => localizedValues['youDoNotHaveFavoriteTemplate'][locale.languageCode];
 
   String get pleaseSelectItem => localizedValues['pleaseSelectItem'][locale.languageCode];