diff --git a/lib/app_router.dart b/lib/app_router.dart
index aeed36c8..c6de2d5a 100644
--- a/lib/app_router.dart
+++ b/lib/app_router.dart
@@ -1,8 +1,11 @@
 import 'package:eatvio_app/presentation/auth/auth_screen/auth_screen.dart';
+import 'package:eatvio_app/presentation/chat/chat_screen/chat_screen.dart';
 import 'package:eatvio_app/presentation/chat/chat_select_screen/chat_select_screen.dart';
 import 'package:eatvio_app/presentation/diary/diary_edit_screen/diary_edit_screen.dart';
+import 'package:eatvio_app/presentation/diets/diet_create_screen/diet_create_screen.dart';
 import 'package:eatvio_app/presentation/diets/diet_select_screen/diet_select_screen.dart';
 import 'package:eatvio_app/presentation/feed/blog_post_create_screen/blog_post_create_screen.dart';
+import 'package:eatvio_app/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart';
 import 'package:eatvio_app/presentation/feed/blog_post_screen/blog_post_screen.dart';
 import 'package:eatvio_app/presentation/feed/feed_screen/feed_screen.dart';
 import 'package:eatvio_app/presentation/glossary/glossary_screen/glossary_screen.dart';
@@ -22,6 +25,7 @@ import 'package:eatvio_app/presentation/registration/favorite_sports_screen/favo
 import 'package:eatvio_app/presentation/registration/gender_screen/gender_screen.dart';
 import 'package:eatvio_app/presentation/registration/height_screen/height_screen.dart';
 import 'package:eatvio_app/presentation/registration/language_select_screen/language_select_screen.dart';
+import 'package:eatvio_app/presentation/registration/medicine_intake_screen/medicine_intake_screen.dart';
 import 'package:eatvio_app/presentation/registration/name_screen/name_screen.dart';
 import 'package:eatvio_app/presentation/registration/weight_screen/weight_screen.dart';
 import 'package:eatvio_app/widgets/bottom_navigation_bar_widget.dart';
@@ -109,6 +113,11 @@ class AppRouter {
                                                         path: 'allergiesScreen',
                                                         builder: (context, state) => AllergiesScreen.builder(context, state.extra),
                                                         routes: [
+                                                          GoRoute(
+                                                            name: 'medicineIntakeScreen',
+                                                            path: 'medicine-intake-screen',
+                                                            builder: (context, state) => MedicineIntakeScreen.builder(context, state.extra),
+                                                          ),
                                                           GoRoute(
                                                             name: 'favoriteFoodsScreen',
                                                             path: 'favorite-foods-screen',
@@ -174,6 +183,16 @@ class AppRouter {
                   context,
                   state.extra.toString(),
                 ),
+                routes: [
+                  GoRoute(
+                    path: 'blog-post-edit-screen',
+                    name: 'blogPostEditScreen',
+                    builder: (context, state) => BlogPostEditScreen.builder(
+                      context,
+                      state.extra,
+                    ),
+                  ),
+                ],
               ),
             ],
           ),
@@ -186,6 +205,13 @@ class AppRouter {
             path: '/chat-select-screen',
             name: 'chatSelectScreen',
             builder: (context, state) => ChatSelectScreen(),
+            routes: [
+              GoRoute(
+                path: 'chat-screen',
+                name: 'chatScreen',
+                builder: (context, state) => ChatScreen.builder(context, state.extra),
+              ),
+            ],
           ),
         ],
       ),
@@ -204,6 +230,11 @@ class AppRouter {
         name: 'dietSelectScreen',
         builder: (context, state) => DietSelectScreen.builder(context),
       ),
+      GoRoute(
+        path: '/diet-create-screen',
+        name: 'dietCreateScreen',
+        builder: (context, state) => DietCreateScreen.builder(context),
+      ),
       GoRoute(
         path: '/plan-select-screen',
         name: 'planSelectScreen',
diff --git a/lib/core/utils/progress_dialog_utils.dart b/lib/core/utils/progress_dialog_utils.dart
index 7ac6ed70..ce4da750 100644
--- a/lib/core/utils/progress_dialog_utils.dart
+++ b/lib/core/utils/progress_dialog_utils.dart
@@ -1,6 +1,5 @@
 import 'package:eatvio_app/app_router.dart';
 import 'package:flutter/material.dart';
-import 'package:eatvio_app/core/app_export.dart';
 
 class ProgressDialogUtils {
   static bool isProgressVisible = false;
diff --git a/lib/localization/app_localization.dart b/lib/localization/app_localization.dart
index 98ee1ebf..2fc106da 100644
--- a/lib/localization/app_localization.dart
+++ b/lib/localization/app_localization.dart
@@ -4,7 +4,6 @@ import 'ru/ru_translations.dart';
 //import 'en_us/en_us_translations.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/cupertino.dart';
-import '../core/app_export.dart';
 
 class AppLocalization {
   AppLocalization(this.locale);
diff --git a/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart b/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart
index 8c33f02b..caaa4c1b 100644
--- a/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart
+++ b/lib/presentation/chat/chat_screen/bloc/chat_bloc.dart
@@ -9,7 +9,9 @@ import 'dart:convert';
 import '/core/app_export.dart';
 import 'package:eatvio_app/presentation/chat/chat_screen/models/chat_model.dart';
 import 'package:eatvio_app/presentation/chat/chat_screen/models/chat_message_model.dart';
+
 part 'chat_event.dart';
+
 part 'chat_state.dart';
 
 /// A bloc that manages the state of a Chat according to the event that is dispatched to it.
@@ -37,17 +39,12 @@ class ChatBloc extends Bloc<ChatEvent, ChatState> {
       );
       if (response.statusCode == 200) {
         final data = jsonDecode(response.body);
-        if (data is Map<String, dynamic> &&
-            data.containsKey('chatRoom') &&
-            data['chatRoom'].containsKey('messages')) {
+        if (data is Map<String, dynamic> && data.containsKey('chatRoom') && data['chatRoom'].containsKey('messages')) {
           if (state is ChatLoadedState) {
             var currentState = state as ChatLoadedState;
-            emit(currentState.copyWith(
-                chatModelObj: currentState.chatModelObj,
-                messages: currentState.messages));
+            emit(currentState.copyWith(chatModelObj: currentState.chatModelObj, messages: currentState.messages));
           } else {
-            emit(ChatLoadedState(
-                messages: fillMessages(data['chatRoom']['messages'])));
+            emit(ChatLoadedState(messages: fillMessages(data['chatRoom']['messages'])));
           }
         } else {
           // Один или несколько ключевых полей отсутствуют, обрабатываем ошибку
diff --git a/lib/presentation/chat/chat_screen/chat_screen.dart b/lib/presentation/chat/chat_screen/chat_screen.dart
index b69a0ecd..8e34fc40 100644
--- a/lib/presentation/chat/chat_screen/chat_screen.dart
+++ b/lib/presentation/chat/chat_screen/chat_screen.dart
@@ -1,4 +1,3 @@
-import 'package:eatvio_app/app_router.dart';
 import 'package:go_router/go_router.dart';
 
 import 'bloc/chat_bloc.dart';
@@ -8,12 +7,11 @@ import 'package:flutter/material.dart';
 import 'package:eatvio_app/widgets/app_bar/custom_app_bar.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_subtitle.dart';
 import 'package:eatvio_app/widgets/app_bar/appbar_leading_image.dart';
-import 'package:eatvio_app/widgets/app_bar/appbar_title_image.dart';
 
 class ChatScreen extends StatelessWidget {
   const ChatScreen({Key? key}) : super(key: key);
-  static Widget builder(BuildContext context) {
-    final chatID = ModalRoute.of(context)!.settings.arguments;
+
+  static Widget builder(BuildContext context, chatID) {
     return BlocProvider<ChatBloc>(
         create: (context) => ChatBloc(
             ChatState(chatModelObj: ChatModel(chatID: chatID.toString())))
@@ -25,9 +23,8 @@ class ChatScreen extends StatelessWidget {
     return BlocBuilder<ChatBloc, ChatState>(
       builder: (context, state) {
         if (state is ChatInitialState) {
-          // Это начальное состояние, данные ещё не загружены.
-          return Container(
-            color: Colors.white,
+          return Scaffold(
+            body: Center(child: CircularProgressIndicator(),),
           );
         } else if (state is ChatLoadedState) {
           // Данные загружены, можно строить экран.
@@ -36,8 +33,9 @@ class ChatScreen extends StatelessWidget {
           // Произошла ошибка при загрузке данных.
           return Center(child: Text(state.errorMessage));
         } else {
-          // Другие состояния, если они есть.
-          return Container(); // Пустой контейнер для необработанных состояний.
+          return Scaffold(
+            body: Center(child: CircularProgressIndicator(),),
+          );
         }
       },
     );
@@ -80,16 +78,13 @@ class ChatScreen extends StatelessWidget {
         padding: EdgeInsets.only(left: 12.h),
         child: Row(
           children: [
-            AppbarTitleImage(
-              imagePath: ImageConstant.imgIconMoreHorizontal,
-              margin: EdgeInsets.only(bottom: 3.v),
-            ),
             Padding(
               padding: EdgeInsets.only(
                 left: 12.h,
                 top: 2.v,
               ),
               child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   AppbarSubtitle(
                     text: "Валерий Леонтьев",
@@ -105,19 +100,6 @@ class ChatScreen extends StatelessWidget {
     );
   }
 
-  ///Handling page based on route
-  Widget getCurrentPage(
-    BuildContext context,
-    String currentRoute,
-  ) {
-    switch (currentRoute) {
-      case '/chat':
-        return ChatScreen.builder(context);
-      default:
-        return ChatScreen();
-    }
-  }
-
   /// Navigates to the previous screen.
   onTapArrowleftone(BuildContext context) {
     GoRouter.of(context).pop();
diff --git a/lib/presentation/chat/chat_select_screen/chat_select_screen.dart b/lib/presentation/chat/chat_select_screen/chat_select_screen.dart
index e59e2155..ba6c8869 100644
--- a/lib/presentation/chat/chat_select_screen/chat_select_screen.dart
+++ b/lib/presentation/chat/chat_select_screen/chat_select_screen.dart
@@ -11,75 +11,77 @@ class ChatSelectScreen extends StatelessWidget {
 
   static Widget builder(BuildContext context) {
     return BlocProvider<ChatSelectBloc>(
-        create: (context) => ChatSelectBloc(ChatSelectState(chatSelectModelObj: ChatSelectModel()))..add(ChatSelectInitialEvent()), child: ChatSelectScreen());
+      create: (context) => ChatSelectBloc(ChatSelectState(chatSelectModelObj: ChatSelectModel()))
+        ..add(
+          ChatSelectInitialEvent(),
+        ),
+      child: ChatSelectScreen(),
+    );
   }
 
   Widget build(BuildContext context) {
     return BlocBuilder<ChatSelectBloc, ChatSelectState>(
-        builder: (context, state) {
-          if (state is ChatSelectInitialState) {
-            // Это начальное состояние, данные ещё не загружены.
-            return Container(
-              color: Colors.white,
-            );
-          } else if (state is ChatSelectLoadedState) {
-            // Данные загружены, можно строить экран.
-            return _buildScreen(context, state);
-          } else if (state is ChatSelectErrorState) {
-            // Произошла ошибка при загрузке данных.
-            return Center(child: Text(state.errorMessage));
-          } else {
-            // Другие состояния, если они есть.
-            return Container(); // Пустой контейнер для необработанных состояний.
-          }
-        },
+      builder: (context, state) {
+        if (state is ChatSelectInitialState) {
+          // Это начальное состояние, данные ещё не загружены.
+          return Container(
+            color: Colors.white,
+          );
+        } else if (state is ChatSelectLoadedState) {
+          // Данные загружены, можно строить экран.
+          return _buildScreen(context, state);
+        } else if (state is ChatSelectErrorState) {
+          // Произошла ошибка при загрузке данных.
+          return Center(child: Text(state.errorMessage));
+        } else {
+          // Другие состояния, если они есть.
+          return Container(); // Пустой контейнер для необработанных состояний.
+        }
+      },
     );
   }
 
   _buildScreen(BuildContext context, ChatSelectLoadedState state) {
-    mediaQueryData = MediaQuery.of(context);
-    return SafeArea(
-      child: Scaffold(
-        resizeToAvoidBottomInset: false,
-        body: Container(
-          width: double.maxFinite,
-          decoration: AppDecoration.fillGray,
-          child: ListView(
-            children: [
-              SizedBox(height: 30.v),
-              Container(
-                margin: EdgeInsets.only(
-                  left: 16.h,
-                  right: 20.h,
-                  bottom: 10.h,
-                ),
-                padding: EdgeInsets.all(12.h),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.grey.withOpacity(0.5),
-                      spreadRadius: 2,
-                      blurRadius: 5,
-                      offset: Offset(0, 3),
-                    ),
-                  ],
-                ),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    CustomSearchView(
-                      controller: state.searchController,
-                      hintText: "Поиск",
-                    ),
-                    SizedBox(height: 20.v),
-                    _buildChatList(context, state),
-                  ],
-                ),
-              )
-            ],
-          ),
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      body: Container(
+        width: double.maxFinite,
+        decoration: AppDecoration.fillGray,
+        child: ListView(
+          children: [
+            SizedBox(height: 30.v),
+            Container(
+              margin: EdgeInsets.only(
+                left: 16.h,
+                right: 20.h,
+                bottom: 10.h,
+              ),
+              padding: EdgeInsets.all(12.h),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: const BorderRadius.all(Radius.circular(12)),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.grey.withOpacity(0.5),
+                    spreadRadius: 2,
+                    blurRadius: 5,
+                    offset: Offset(0, 3),
+                  ),
+                ],
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CustomSearchView(
+                    controller: state.searchController,
+                    hintText: "Поиск",
+                  ),
+                  SizedBox(height: 20.v),
+                  _buildChatList(context, state),
+                ],
+              ),
+            )
+          ],
         ),
       ),
     );
diff --git a/lib/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart b/lib/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart
index cd3ad78f..5c38ffb7 100644
--- a/lib/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart
+++ b/lib/presentation/feed/blog_post_edit_screen/blog_post_edit_screen.dart
@@ -8,8 +8,7 @@ import 'package:flutter_dotenv/flutter_dotenv.dart';
 class BlogPostEditScreen extends StatelessWidget {
   const BlogPostEditScreen({Key? key}) : super(key: key);
 
-  static Widget builder(BuildContext context) {
-    final blog_postID = ModalRoute.of(context)!.settings.arguments;
+  static Widget builder(BuildContext context, blog_postID) {
     return BlocProvider<BlogPostEditBloc>(
         create: (context) =>
             BlogPostEditBloc(BlogPostEditState(blog_postModelObj: BlogPostEditModel(blog_postID: blog_postID.toString())))..add(BlogPostEditInitialEvent()),
@@ -20,9 +19,10 @@ class BlogPostEditScreen extends StatelessWidget {
     return BlocBuilder<BlogPostEditBloc, BlogPostEditState>(
       builder: (context, state) {
         if (state is BlogPostEditInitialState) {
-          // Это начальное состояние, данные ещё не загружены.
-          return Container(
-            color: Colors.white,
+          return Scaffold(
+            body: Center(
+              child: CircularProgressIndicator(),
+            ),
           );
         } else if (state is BlogPostEditLoadedState) {
           // Данные загружены, можно строить экран.
@@ -31,8 +31,11 @@ class BlogPostEditScreen extends StatelessWidget {
           // Произошла ошибка при загрузке данных.
           return Center(child: Text(state.errorMessage));
         } else {
-          // Другие состояния, если они есть.
-          return Container(); // Пустой контейнер для необработанных состояний.
+          return Scaffold(
+            body: Center(
+              child: CircularProgressIndicator(),
+            ),
+          );
         }
       },
     );
@@ -40,76 +43,74 @@ class BlogPostEditScreen extends StatelessWidget {
 
   _buildBlogPostEdit(BuildContext context, BlogPostEditLoadedState state) {
     mediaQueryData = MediaQuery.of(context);
-    return SafeArea(
-      child: Scaffold(
-        resizeToAvoidBottomInset: false,
-        body: Container(
-          width: double.maxFinite,
-          decoration: AppDecoration.fillGray,
-          child: ListView(
-            children: [
-              SizedBox(height: 30.v),
-              Container(
-                margin: EdgeInsets.only(
-                  left: 16.h,
-                  right: 20.h,
-                  bottom: 10.h,
-                ),
-                padding: EdgeInsets.all(12.h),
-                decoration: BoxDecoration(
-                  color: Colors.white,
-                  borderRadius: const BorderRadius.all(Radius.circular(12)),
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.grey.withOpacity(0.5),
-                      spreadRadius: 2,
-                      blurRadius: 5,
-                      offset: Offset(0, 3),
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      body: Container(
+        width: double.maxFinite,
+        decoration: AppDecoration.fillGray,
+        child: ListView(
+          children: [
+            SizedBox(height: 30.v),
+            Container(
+              margin: EdgeInsets.only(
+                left: 16.h,
+                right: 20.h,
+                bottom: 10.h,
+              ),
+              padding: EdgeInsets.all(12.h),
+              decoration: BoxDecoration(
+                color: Colors.white,
+                borderRadius: const BorderRadius.all(Radius.circular(12)),
+                boxShadow: [
+                  BoxShadow(
+                    color: Colors.grey.withOpacity(0.5),
+                    spreadRadius: 2,
+                    blurRadius: 5,
+                    offset: Offset(0, 3),
+                  ),
+                ],
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CachedNetworkImage(
+                    imageUrl: dotenv.env['STORAGE_URL']! + (state.blog_post?['image'] ?? ''),
+                    imageBuilder: (context, imageProvider) => CircleAvatar(
+                      backgroundImage: imageProvider,
+                      radius: 25,
                     ),
-                  ],
-                ),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    CachedNetworkImage(
-                      imageUrl: dotenv.env['STORAGE_URL']! + (state.blog_post?['image'] ?? ''),
-                      imageBuilder: (context, imageProvider) => CircleAvatar(
-                        backgroundImage: imageProvider,
-                        radius: 25,
-                      ),
-                      placeholder: (context, url) => CircularProgressIndicator(),
-                      errorWidget: (context, url, error) => CircleAvatar(
-                        child: Icon(Icons.person),
-                        backgroundColor: Colors.white,
-                        radius: 25,
-                      ),
+                    placeholder: (context, url) => CircularProgressIndicator(),
+                    errorWidget: (context, url, error) => CircleAvatar(
+                      child: Icon(Icons.person),
+                      backgroundColor: Colors.white,
+                      radius: 25,
                     ),
-                    SizedBox(height: 16.0),
-                    TextFormField(
-                      controller: state.title,
-                      decoration: InputDecoration(labelText: 'Заголовок'),
-                    ),
-                    SizedBox(height: 16.0),
-                    TextFormField(
-                      controller: state.description,
-                      decoration: InputDecoration(labelText: 'Описание'),
-                    ),
-                    SizedBox(height: 16.0),
-                    TextFormField(
-                      controller: state.youtube_url,
-                      decoration: InputDecoration(labelText: 'Ссылка'),
-                    ),
-                    SizedBox(height: 16.0),
-                    // Здесь нужно добавить виджет для загрузки картинки
-                    ElevatedButton(
-                      onPressed: () => context.read<BlogPostEditBloc>().add(EditBlogPost()),
-                      child: Text('Сохранить'),
-                    )
-                  ],
-                ),
-              )
-            ],
-          ),
+                  ),
+                  SizedBox(height: 16.0),
+                  TextFormField(
+                    controller: state.title,
+                    decoration: InputDecoration(labelText: 'Заголовок'),
+                  ),
+                  SizedBox(height: 16.0),
+                  TextFormField(
+                    controller: state.description,
+                    decoration: InputDecoration(labelText: 'Описание'),
+                  ),
+                  SizedBox(height: 16.0),
+                  TextFormField(
+                    controller: state.youtube_url,
+                    decoration: InputDecoration(labelText: 'Ссылка'),
+                  ),
+                  SizedBox(height: 16.0),
+                  // Здесь нужно добавить виджет для загрузки картинки
+                  ElevatedButton(
+                    onPressed: () => context.read<BlogPostEditBloc>().add(EditBlogPost()),
+                    child: Text('Сохранить'),
+                  )
+                ],
+              ),
+            )
+          ],
         ),
       ),
     );
diff --git a/lib/presentation/registration/additional_information_screen/additional_information_screen.dart b/lib/presentation/registration/additional_information_screen/additional_information_screen.dart
index 0a695a5b..c855fb4b 100644
--- a/lib/presentation/registration/additional_information_screen/additional_information_screen.dart
+++ b/lib/presentation/registration/additional_information_screen/additional_information_screen.dart
@@ -28,39 +28,37 @@ class AdditionalInformationScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    mediaQueryData = MediaQuery.of(context);
-    return SafeArea(
-        child: Scaffold(
-            resizeToAvoidBottomInset: false,
-            appBar: _buildAppBar(context),
-            body: Container(
-                width: double.maxFinite,
-                padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v),
-                child: Column(children: [
-                  SizedBox(height: 7.v),
-                  Container(
-                      height: 16.v,
-                      width: 343.h,
-                      decoration: BoxDecoration(
-                          color: theme.colorScheme.onPrimary,
-                          borderRadius: BorderRadius.circular(8.h),
-                          border: Border.all(color: theme.colorScheme.primary, width: 1.h)),
-                      child: ClipRRect(
-                          borderRadius: BorderRadius.circular(8.h),
-                          child: LinearProgressIndicator(
-                              value: 1, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400)))),
-                  SizedBox(height: 20.v),
-                  SizedBox(height: 73.v),
-                  _buildTextFormField(context),
-                  Spacer(),
-                  BlocBuilder<AdditionalInformationBloc, AdditionalInformationState>(builder: (context, state) {
-                    return NextStepButton(
-                        text: "finish".tr.toUpperCase(),
-                        margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
-                        buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                        onPressed: onTapFinish(state, context));
-                  }),
-                ]))));
+    return Scaffold(
+        resizeToAvoidBottomInset: false,
+        appBar: _buildAppBar(context),
+        body: Container(
+            width: double.maxFinite,
+            padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v),
+            child: Column(children: [
+              SizedBox(height: 7.v),
+              Container(
+                  height: 16.v,
+                  width: 343.h,
+                  decoration: BoxDecoration(
+                      color: theme.colorScheme.onPrimary,
+                      borderRadius: BorderRadius.circular(8.h),
+                      border: Border.all(color: theme.colorScheme.primary, width: 1.h)),
+                  child: ClipRRect(
+                      borderRadius: BorderRadius.circular(8.h),
+                      child: LinearProgressIndicator(
+                          value: 1, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400)))),
+              SizedBox(height: 20.v),
+              SizedBox(height: 73.v),
+              _buildTextFormField(context),
+              Spacer(),
+              BlocBuilder<AdditionalInformationBloc, AdditionalInformationState>(builder: (context, state) {
+                return NextStepButton(
+                    text: "finish".tr.toUpperCase(),
+                    margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
+                    buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                    onPressed: onTapFinish(state, context));
+              }),
+            ])));
   }
 
   onTapFinish(AdditionalInformationState state, BuildContext context) {
diff --git a/lib/presentation/registration/medicine_intake_screen/medicine_intake_screen.dart b/lib/presentation/registration/medicine_intake_screen/medicine_intake_screen.dart
index bfd40851..9f01f6f8 100644
--- a/lib/presentation/registration/medicine_intake_screen/medicine_intake_screen.dart
+++ b/lib/presentation/registration/medicine_intake_screen/medicine_intake_screen.dart
@@ -14,8 +14,7 @@ import 'package:flutter/material.dart';
 class MedicineIntakeScreen extends StatefulWidget {
   const MedicineIntakeScreen({Key? key}) : super(key: key);
 
-  static Widget builder(BuildContext context) {
-    final sheet = ModalRoute.of(context)!.settings.arguments as UserRegistrationSheet;
+  static Widget builder(BuildContext context, sheet) {
     return BlocProvider<MedicineIntakeBloc>(
         create: (context) => MedicineIntakeBloc(MedicineIntakeState(medicineIntakeModelObj: MedicineIntakeModel(userRegistrationSheet: sheet)))
           ..add(MedicineIntakeInitialEvent()),
@@ -30,49 +29,48 @@ class _MedicineIntakeScreenState extends State<MedicineIntakeScreen> {
   @override
   Widget build(BuildContext context) {
     mediaQueryData = MediaQuery.of(context);
-    return SafeArea(
-        child: Scaffold(
-            resizeToAvoidBottomInset: false,
-            appBar: _buildAppBar(context),
-            body: Container(
-                width: double.maxFinite,
-                padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v),
-                child: Column(children: [
-                  SizedBox(height: 7.v),
-                  Container(
-                      height: 16.v,
-                      width: 343.h,
-                      decoration: BoxDecoration(
-                          color: theme.colorScheme.onPrimary,
-                          borderRadius: BorderRadius.circular(8.h),
-                          border: Border.all(color: theme.colorScheme.primary, width: 1.h)),
-                      child: ClipRRect(
-                          borderRadius: BorderRadius.circular(8.h),
-                          child: LinearProgressIndicator(
-                              value: 0.69, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400)))),
-                  SizedBox(height: 20.v),
-                  Container(
-                      width: 271.h,
-                      margin: EdgeInsets.only(left: 35.h, right: 36.h),
-                      child: Text("do_you_take_pills".tr,
-                          maxLines: 2, overflow: TextOverflow.ellipsis, textAlign: TextAlign.center, style: theme.textTheme.headlineSmall)),
-                  SizedBox(height: 86.v),
-                  _buildTextFormField(context),
-                  Spacer(),
-                  BlocBuilder<MedicineIntakeBloc, MedicineIntakeState>(builder: (context, state) {
-                    return NextStepButton(
-                        text: "continue".tr.toUpperCase(),
-                        margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
-                        buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
-                        onPressed: onTapNext(state, context));
-                  }),
-                  BlocBuilder<MedicineIntakeBloc, MedicineIntakeState>(builder: (context, state) {
-                    return GestureDetector(
-                      onTap: onTapSkip(state, context),
-                      child: Text("skip".tr, style: theme.textTheme.bodyLarge),
-                    );
-                  }),
-                ]))));
+    return Scaffold(
+        resizeToAvoidBottomInset: false,
+        appBar: _buildAppBar(context),
+        body: Container(
+            width: double.maxFinite,
+            padding: EdgeInsets.symmetric(horizontal: 16.h, vertical: 9.v),
+            child: Column(children: [
+              SizedBox(height: 7.v),
+              Container(
+                  height: 16.v,
+                  width: 343.h,
+                  decoration: BoxDecoration(
+                      color: theme.colorScheme.onPrimary,
+                      borderRadius: BorderRadius.circular(8.h),
+                      border: Border.all(color: theme.colorScheme.primary, width: 1.h)),
+                  child: ClipRRect(
+                      borderRadius: BorderRadius.circular(8.h),
+                      child: LinearProgressIndicator(
+                          value: 0.69, backgroundColor: theme.colorScheme.onPrimary, valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400)))),
+              SizedBox(height: 20.v),
+              Container(
+                  width: 271.h,
+                  margin: EdgeInsets.only(left: 35.h, right: 36.h),
+                  child: Text("do_you_take_pills".tr,
+                      maxLines: 2, overflow: TextOverflow.ellipsis, textAlign: TextAlign.center, style: theme.textTheme.headlineSmall)),
+              SizedBox(height: 86.v),
+              _buildTextFormField(context),
+              Spacer(),
+              BlocBuilder<MedicineIntakeBloc, MedicineIntakeState>(builder: (context, state) {
+                return NextStepButton(
+                    text: "continue".tr.toUpperCase(),
+                    margin: EdgeInsets.only(left: 16.h, right: 16.h, bottom: 50.v),
+                    buttonStyle: CustomButtonStyles.outlinePrimaryTL15,
+                    onPressed: onTapNext(state, context));
+              }),
+              BlocBuilder<MedicineIntakeBloc, MedicineIntakeState>(builder: (context, state) {
+                return GestureDetector(
+                  onTap: onTapSkip(state, context),
+                  child: Text("skip".tr, style: theme.textTheme.bodyLarge),
+                );
+              }),
+            ])));
   }
 
   onTapSkip(MedicineIntakeState state, BuildContext context) {