diff --git a/lib/features/auth/registration/view/initial_registration_step.dart b/lib/features/auth/registration/view/initial_registration_step.dart
index 7c0492c..c36cafe 100644
--- a/lib/features/auth/registration/view/initial_registration_step.dart
+++ b/lib/features/auth/registration/view/initial_registration_step.dart
@@ -1,10 +1,12 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
+import 'package:cims_apps/features/dashboard/dashboard_public/view/dashboard_public_view.dart';
 import 'package:flutter/material.dart';
 
 class InitialRegistrationStep extends StatelessWidget {
@@ -92,12 +94,12 @@ class InitialRegistrationStep extends StatelessWidget {
       {
         'desc': 'Personal Data',
         'isActive': true,
-        'isDone': true,
+        'isDone': false,
         'isLast': false,
       },
       {
         'desc': 'Email',
-        'isActive': true,
+        'isActive': false,
         'isDone': false,
         'isLast': false,
       },
@@ -146,9 +148,8 @@ class InitialRegistrationStep extends StatelessWidget {
     ];
 
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Registration'),
-      ),
+      appBar:
+          CustomAppBar(height: SizeConfig.height * .1, title: 'Registration'),
       body: Container(
         padding: const EdgeInsets.symmetric(horizontal: 24.0),
         child: Column(
@@ -175,7 +176,7 @@ class InitialRegistrationStep extends StatelessWidget {
               ],
             ),
             SizedBox(
-              height: SizeConfig.height * .6,
+              height: SizeConfig.height * .55,
               child: SingleChildScrollView(
                 scrollDirection: Axis.vertical,
                 child: Column(
@@ -192,12 +193,29 @@ class InitialRegistrationStep extends StatelessWidget {
                 ),
               ),
             ),
-            ButtonView(
-              name: 'Let’s Start',
-              marginVertical: 8.0,
-              onPressed: () {
-                routePush(context, page: const SubmissionParent());
-              },
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                ButtonView(
+                  name: 'Home Page',
+                  marginVertical: 8.0,
+                  width: SizeConfig.width * .42,
+                  isOutlined: true,
+                  onPressed: () {
+                    routePush(context,
+                        page: const DashboardPublicView(),
+                        routeType: RouteType.pushReplace);
+                  },
+                ),
+                ButtonView(
+                  name: 'Let’s Start',
+                  marginVertical: 8.0,
+                  width: SizeConfig.width * .42,
+                  onPressed: () {
+                    routePush(context, page: const SubmissionParent());
+                  },
+                ),
+              ],
             )
           ],
         ),
diff --git a/lib/features/auth/registration/view/registration_password_view.dart b/lib/features/auth/registration/view/registration_password_view.dart
index ce8d3ac..d614e6c 100644
--- a/lib/features/auth/registration/view/registration_password_view.dart
+++ b/lib/features/auth/registration/view/registration_password_view.dart
@@ -7,7 +7,7 @@ import 'package:cims_apps/application/component/text_form/text_form_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
-import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
+import 'package:cims_apps/features/auth/registration/view/initial_registration_step.dart';
 import 'package:cims_apps/features/auth/registration/viewmodel/registration_viewmodel.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -45,6 +45,8 @@ class RegistrationPasswordView extends StatelessWidget {
                         validator: (value) {
                           if (value!.isEmpty) {
                             return 'Password must filled';
+                          } else if (value.length <= 8) {
+                            return 'Minimum password 8 Character';
                           } else {
                             return null;
                           }
@@ -139,7 +141,7 @@ class DialogSuccess extends StatelessWidget {
               marginVertical: 8.0,
               onPressed: () {
                 routePush(context,
-                    page: const SubmissionParent(),
+                    page: const InitialRegistrationStep(),
                     routeType: RouteType.pushReplace);
               },
             )