diff --git a/lib/apis/providers/api_provider.dart b/lib/apis/providers/api_provider.dart
index 9e72d48..fe4c944 100644
--- a/lib/apis/providers/api_provider.dart
+++ b/lib/apis/providers/api_provider.dart
@@ -6,7 +6,7 @@ import 'package:video_calling_app/constants/urls.dart';
 
 class ApiProvider {
   ApiProvider(this._client, {this.baseUrl}) {
-    baseUrl ??= AppUrls.baseUrl;
+    baseUrl ??= AppSecrets.awsServerUrl;
   }
 
   final http.Client _client;
diff --git a/lib/modules/auth/views/change_password_view.dart b/lib/modules/auth/views/change_password_view.dart
index 485fad3..0ecf914 100644
--- a/lib/modules/auth/views/change_password_view.dart
+++ b/lib/modules/auth/views/change_password_view.dart
@@ -28,8 +28,9 @@ class ChangePasswordView extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      const NxAppBar(
+                      NxAppBar(
                         title: StringValues.changePassword,
+                        padding: Dimens.edgeInsets8_16,
                       ),
                       _buildBody(logic),
                     ],
@@ -41,7 +42,7 @@ class ChangePasswordView extends StatelessWidget {
                     child: NxFilledButton(
                       borderRadius: Dimens.zero,
                       onTap: logic.changePassword,
-                      label: StringValues.changePassword,
+                      label: StringValues.changePassword.toUpperCase(),
                     ),
                   )
                 ],
@@ -56,7 +57,7 @@ class ChangePasswordView extends StatelessWidget {
   Widget _buildBody(ChangePasswordController logic) => Expanded(
         child: SingleChildScrollView(
           child: Padding(
-            padding: Dimens.edgeInsets8,
+            padding: Dimens.edgeInsets8_16,
             child: FocusScope(
               node: logic.focusNode,
               child: Column(
diff --git a/lib/modules/calling/views/join_view.dart b/lib/modules/calling/views/join_view.dart
index fa59d96..ed7c720 100644
--- a/lib/modules/calling/views/join_view.dart
+++ b/lib/modules/calling/views/join_view.dart
@@ -29,8 +29,9 @@ class JoinView extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.start,
                       crossAxisAlignment: CrossAxisAlignment.stretch,
                       children: [
-                        const NxAppBar(
+                        NxAppBar(
                           title: StringValues.join,
+                          padding: Dimens.edgeInsets8_16,
                         ),
                         Expanded(
                           child: Column(
@@ -39,7 +40,7 @@ class JoinView extends StatelessWidget {
                             children: [
                               const Expanded(child: SizedBox()),
                               Padding(
-                                padding: Dimens.edgeInsets8,
+                                padding: Dimens.edgeInsets8_16,
                                 child: Column(
                                   children: [
                                     TextFormField(
diff --git a/lib/modules/calling/views/start_view.dart b/lib/modules/calling/views/start_view.dart
index ad8bd22..81d38f6 100644
--- a/lib/modules/calling/views/start_view.dart
+++ b/lib/modules/calling/views/start_view.dart
@@ -29,8 +29,9 @@ class StartView extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                      const NxAppBar(
+                      NxAppBar(
                         title: StringValues.start,
+                        padding: Dimens.edgeInsets8_16,
                       ),
                       Expanded(
                         child: Column(
@@ -39,7 +40,7 @@ class StartView extends StatelessWidget {
                           children: [
                             const Expanded(child: SizedBox()),
                             Padding(
-                              padding: Dimens.edgeInsets8,
+                              padding: Dimens.edgeInsets8_16,
                               child: Column(
                                 children: [
                                   Row(
diff --git a/lib/modules/profile/views/profile_view.dart b/lib/modules/profile/views/profile_view.dart
index 25d824e..9330488 100644
--- a/lib/modules/profile/views/profile_view.dart
+++ b/lib/modules/profile/views/profile_view.dart
@@ -29,12 +29,13 @@ class ProfileView extends StatelessWidget {
         height: Dimens.screenHeight,
         child: Column(
           children: [
-            const NxAppBar(
+            NxAppBar(
               title: StringValues.profile,
+              padding: Dimens.edgeInsets8_16,
             ),
             Expanded(
               child: Padding(
-                padding: Dimens.edgeInsets8,
+                padding: Dimens.edgeInsets8_16,
                 child: GetBuilder<ProfileController>(
                   builder: (logic) {
                     if (logic.isLoading) {