diff --git a/android/local.properties b/android/local.properties
index 7a702e0..e56c555 100644
--- a/android/local.properties
+++ b/android/local.properties
@@ -1,5 +1,5 @@
 sdk.dir=C:\\Users\\sikander.saleem\\Documents\\Sdks\\android
 flutter.sdk=C:\\Users\\sikander.saleem\\Documents\\Sdks\\flutter
-flutter.buildMode=release
+flutter.buildMode=debug
 flutter.versionName=1.0.0
 flutter.versionCode=1
\ No newline at end of file
diff --git a/lib/ui/common_appbar.dart b/lib/ui/common_appbar.dart
index 373f905..eff1c4b 100644
--- a/lib/ui/common_appbar.dart
+++ b/lib/ui/common_appbar.dart
@@ -68,6 +68,7 @@ class _CommonAppbarState extends State<CommonAppbar> {
       try {
         var model = await TangheemUserApiClient().getNavigation();
         navigationList = model?.data ?? [];
+        navigationList.removeWhere((element) => element.navigationId == 9); // this is for temporary, to release app on app store as file size are about 100 mbs
         navigationList.sort((a, b) => a.orderNo.compareTo(b.orderNo));
         AppState().setNavigationModel(model);
       } catch (ex) {}
diff --git a/lib/ui/screens/contact_us_screen.dart b/lib/ui/screens/contact_us_screen.dart
index 955d06b..a3a567f 100644
--- a/lib/ui/screens/contact_us_screen.dart
+++ b/lib/ui/screens/contact_us_screen.dart
@@ -52,7 +52,7 @@ class _ContactUsScreenState extends State<ContactUsScreen> {
     return Scaffold(
       backgroundColor: ColorConsts.secondaryWhite,
       body: SingleChildScrollView(
-        padding: EdgeInsets.all(32.0),
+        padding: EdgeInsets.all(21.0),
         physics: BouncingScrollPhysics(),
         child: Container(
           width: MediaQuery.of(context).size.width,
diff --git a/lib/ui/screens/forgot_password_screen.dart b/lib/ui/screens/forgot_password_screen.dart
index 16a81a8..9119c60 100644
--- a/lib/ui/screens/forgot_password_screen.dart
+++ b/lib/ui/screens/forgot_password_screen.dart
@@ -81,7 +81,7 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
     return Scaffold(
       backgroundColor: ColorConsts.secondaryWhite,
       body: SingleChildScrollView(
-        padding: EdgeInsets.all(32.0),
+        padding: EdgeInsets.all(21.0),
         physics: BouncingScrollPhysics(),
         child: Container(
           width: MediaQuery.of(context).size.width,
diff --git a/lib/ui/screens/login_screen.dart b/lib/ui/screens/login_screen.dart
index 85a2bf3..df026ca 100644
--- a/lib/ui/screens/login_screen.dart
+++ b/lib/ui/screens/login_screen.dart
@@ -87,7 +87,7 @@ class _LoginScreenState extends State<LoginScreen> {
         child: Directionality(
           textDirection: TextDirection.rtl,
           child: SingleChildScrollView(
-            padding: EdgeInsets.all(32.0),
+            padding: EdgeInsets.all(21.0),
             physics: BouncingScrollPhysics(),
             child: Container(
               width: MediaQuery.of(context).size.width,
diff --git a/lib/ui/screens/registration_screen.dart b/lib/ui/screens/registration_screen.dart
index 5f9d250..2b4e5ad 100644
--- a/lib/ui/screens/registration_screen.dart
+++ b/lib/ui/screens/registration_screen.dart
@@ -88,7 +88,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
     return Scaffold(
       backgroundColor: ColorConsts.secondaryWhite,
       body: SingleChildScrollView(
-        padding: EdgeInsets.all(32.0),
+        padding: EdgeInsets.all(21.0),
         physics: BouncingScrollPhysics(),
         child: Container(
           width: MediaQuery.of(context).size.width,
@@ -143,7 +143,7 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
                     ),
                     SizedBox(height: 8),
                     CommonTextFieldWidget(
-                      hint: " رقم الجوال${" (" + (_selectedCountry?.countryCode ?? "+9xx") + " xxxxxxxxx)"}",
+                      hint: " رقم الجوال (اختياري)${" (" + (_selectedCountry?.countryCode ?? "+9xx") + " xxxxxxxxx)"}",
                       controller: _mobileNumberController,
                       suffixWidget: Text(_selectedCountry?.countryCode ?? "", textDirection: TextDirection.ltr),
                     ),
@@ -195,10 +195,12 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
                             Utils.showToast("يرجى اختيار الدولة");
                             return;
                           }
-                          if (_mobileNumberController.text.length < 1) {
-                            Utils.showToast("يرجى إدخال رقم الجوال");
-                            return;
-                          } else if (_mobileNumberController.text.length < 8 || _mobileNumberController.text.length > 12) {
+                          // if (_mobileNumberController.text.length < 1) {
+                          //   Utils.showToast("يرجى إدخال رقم الجوال");
+                          //   return;
+                          // } else
+
+                          if (_mobileNumberController.text.isNotEmpty && (_mobileNumberController.text.length < 8 || _mobileNumberController.text.length > 12)) {
                             Utils.showToast("رقم الهاتف غير صحيح");
                             return;
                           }