diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
index ae6342c4..c9202e52 100644
--- a/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
+++ b/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
@@ -86,7 +86,7 @@ class _AddExaminationWidgetState extends State<AddExaminationWidget> {
                             : widget.item.nameEn,
 
                       color: Color(0xFF575757),
-                      fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*3.8,
+                      fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*(SizeConfig.isWidthLarge?3:3.8),
                       letterSpacing: -0.56,
                     ),
                   ),
diff --git a/lib/screens/patients/profile/soap_update/soap_utils.dart b/lib/screens/patients/profile/soap_update/soap_utils.dart
index 455b5439..6c5d4f02 100644
--- a/lib/screens/patients/profile/soap_update/soap_utils.dart
+++ b/lib/screens/patients/profile/soap_update/soap_utils.dart
@@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/models/SOAP/selected_items/my_selected_histor
 
 class SoapUtils {
   static MySelectedHistory generateMySelectedHistory(
-      {history, isChecked, remark, isLocal = true}) {
+      {history, isChecked = false, remark, isLocal = true}) {
     MySelectedHistory mySelectedHistory = MySelectedHistory(
         selectedHistory: history,
         isChecked: isChecked,
@@ -17,11 +17,11 @@ class SoapUtils {
   static MySelectedAllergy generateMySelectedAllergy(
       {allergy,
       allergySeverity,
-      isChecked,
+      isChecked = false,
       remark,
       isLocal = true,
       int createdBy,
-      bool isExpanded}) {
+      bool isExpanded = false}) {
     MySelectedAllergy mySelectedAllergy = MySelectedAllergy(
         selectedAllergy: allergy,
         selectedAllergySeverity: allergySeverity,
@@ -36,7 +36,7 @@ class SoapUtils {
   static MySelectedExamination generateMySelectedExamination(
       {examination,
       allergySeverity,
-      isChecked,
+      isChecked =  false,
       remark,
       isLocal = true,
       isNormal,
diff --git a/lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart b/lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart
index 579d8153..130e730d 100644
--- a/lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/allergies/allergies_item.dart
@@ -84,7 +84,7 @@ class _AddAllergiesItemState extends State<AddAllergiesItem> {
                             : widget.item.nameEn
                         : widget.item.nameEn,
                     color: Color(0xFF575757),
-                    fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.8,
+                    fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?3:3.8),
                     letterSpacing: -0.56,
                   ),
                   width: MediaQuery.of(context).size.width * 0.55,
diff --git a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
index b1441ce4..73adb0a3 100644
--- a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
+++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart
@@ -371,6 +371,7 @@ class _UpdateSubjectivePageState extends State<UpdateSubjectivePage> {
       {SOAPViewModel model,
       List<MySelectedAllergy> myAllergiesList,
       List<MySelectedHistory> myHistoryList}) async {
+
     if (FocusScope.of(context).hasFocus) FocusScope.of(context).unfocus();
     widget.changeLoadingState(true);
     formKey.currentState.save();
diff --git a/lib/widgets/shared/dialogs/master_key_dailog.dart b/lib/widgets/shared/dialogs/master_key_dailog.dart
index 7beb3ca6..7c12b54a 100644
--- a/lib/widgets/shared/dialogs/master_key_dailog.dart
+++ b/lib/widgets/shared/dialogs/master_key_dailog.dart
@@ -42,12 +42,12 @@ class _MasterKeyDailogState extends State<MasterKeyDailog> {
   showAlertDialog(BuildContext context, ProjectViewModel projectViewModel) {
     // set up the buttons
     Widget cancelButton = FlatButton(
-        child: AppText(TranslationBase.of(context).cancel, color: Colors.grey,fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5,),
+        child: AppText(TranslationBase.of(context).cancel, color: Colors.grey,fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?3.5:5),),
         onPressed: () {
           Navigator.of(context).pop();
         });
     Widget continueButton = FlatButton(
-        child: AppText(this.widget.okText, color: Colors.grey,fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5,),
+        child: AppText(this.widget.okText, color: Colors.grey,fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * (SizeConfig.isWidthLarge?3.5:5),),
         onPressed: () {
           this.widget.okFunction(widget.selectedValue);
           Navigator.of(context).pop();
diff --git a/lib/widgets/shared/master_key_checkbox_search_widget.dart b/lib/widgets/shared/master_key_checkbox_search_widget.dart
index 8e383ab9..c61913a4 100644
--- a/lib/widgets/shared/master_key_checkbox_search_widget.dart
+++ b/lib/widgets/shared/master_key_checkbox_search_widget.dart
@@ -135,7 +135,7 @@ class _MasterKeyCheckboxSearchWidgetState
                                             : historyInfo.nameEn,
 
                                         color: Color(0xFF575757),
-                                        fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*3.8,
+                                        fontSize: SizeConfig.getTextMultiplierBasedOnWidth()*(SizeConfig.isWidthLarge?3:3.8),
                                         letterSpacing: -0.56,
                                       ),
                                     ),
diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart
index bbd010cd..91b50400 100644
--- a/lib/widgets/shared/text_fields/app-textfield-custom.dart
+++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart
@@ -122,7 +122,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
                             widget.hintText,
                             color: Color(0xFF2E303A),
                             fontSize: widget.isPrscription == false
-                                ? SizeConfig.textMultiplier * 1.3
+                                ? SizeConfig.getHeightMultiplier() * (SizeConfig.isWidthLarge?1.1:  1.3)
                                 : 0,
                             fontWeight: FontWeight.w700,
                           ),