diff --git a/lib/ui/marathon/marathon_screen.dart b/lib/ui/marathon/marathon_screen.dart
index 08ae2b2..1feee8e 100644
--- a/lib/ui/marathon/marathon_screen.dart
+++ b/lib/ui/marathon/marathon_screen.dart
@@ -8,6 +8,7 @@ import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/decorations_helper.dart';
 import 'package:mohem_flutter_app/classes/lottie_consts.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
@@ -42,7 +43,6 @@ class MarathonScreen extends StatelessWidget {
   }
 
   Widget getWinnerWidget(BuildContext context, {required MarathonProvider provider}) {
-    provider.startTimerForWinnerSelection();
     return Container(
       width: double.infinity,
       decoration: MyDecorations.shadowDecoration,
@@ -106,7 +106,7 @@ class MarathonScreen extends StatelessWidget {
     ).paddingOnly(left: 21, right: 21);
   }
 
-  Widget getNameContainer() {
+  Widget getNameContainer(BuildContext context) {
     return Container(
       height: 50,
       padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -118,8 +118,9 @@ class MarathonScreen extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: <Widget>[
-          "Muhammad Shrouff".toText17(isBold: true, color: MyColors.white),
-          "837436".toText17(isBold: true, color: MyColors.white),
+          (AppState().isArabic(context) ? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn! : AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr!)
+              .toText17(isBold: true, color: MyColors.white),
+          AppState().memberInformationList!.eMPLOYEENUMBER!.toText17(isBold: true, color: MyColors.white),
         ],
       ),
     ).paddingOnly(left: 20, right: 20, top: 12, bottom: 20);
@@ -128,27 +129,27 @@ class MarathonScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     MarathonProvider provider = context.watch<MarathonProvider>();
+
     return WillPopScope(
       child: Scaffold(
-        appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr()),
+        appBar: AppBarWidget(context, title: LocaleKeys.brainMarathon.tr(), onHomeTapped: () {
+          Utils.confirmDialog(context, LocaleKeys.youWantToLeaveMarathon.tr());
+        }, onBackTapped: () {
+          Utils.confirmDialog(context, LocaleKeys.youWantToLeaveMarathon.tr());
+        }),
         body: SingleChildScrollView(
           child: Column(
             children: <Widget>[
               20.height,
               if (provider.questionCardStatus == QuestionCardStatus.findingWinner) ...<Widget>[
-                const QualifiersContainer().paddingOnly(left: 21, right: 21),
+                QualifiersContainer(provider: provider).paddingOnly(left: 21, right: 21),
               ] else if (provider.questionCardStatus == QuestionCardStatus.winnerFound)
                 ...<Widget>[]
               else ...<Widget>[
                 MarathonProgressContainer(provider: provider).paddingOnly(left: 21, right: 21),
               ],
               if (provider.questionCardStatus == QuestionCardStatus.findingWinner) ...<Widget>[
-                InkWell(
-                  onTap: () {
-                    provider.updateQuestionCardStatus(QuestionCardStatus.winnerFound);
-                  },
-                  child: getNameContainer(),
-                ),
+                getNameContainer(context),
               ],
               if (provider.questionCardStatus == QuestionCardStatus.winnerFound) ...<Widget>[
                 getWinnerWidget(context, provider: provider),