diff --git a/lib/features/devices/view/widgets/smart_door/create_temporary_password.dart b/lib/features/devices/view/widgets/smart_door/create_temporary_password.dart
index d3628cf..d0ab14d 100644
--- a/lib/features/devices/view/widgets/smart_door/create_temporary_password.dart
+++ b/lib/features/devices/view/widgets/smart_door/create_temporary_password.dart
@@ -135,58 +135,81 @@ class CreateTemporaryPassword extends StatelessWidget {
                       padding: const EdgeInsets.all(20),
                       child: Column(
                         children: [
-                          ListTile(
-                            contentPadding: EdgeInsets.zero,
-                            leading: const BodyMedium(
-                              text: 'Password Name',
-                              fontWeight: FontWeight.normal,
-                            ),
-                            trailing: SizedBox(
-                                width: MediaQuery.of(context).size.width / 2,
-                                child: TextFormField(
-                                  controller:
-                                  BlocProvider.of<SmartDoorBloc>(context).passwordNameController,
-                                  decoration: const InputDecoration(hintText: 'Enter The Name'),
-                                )),
-                          ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+
+                   children: [
+                      Expanded(
+                        child: Container(
+                        child: const BodyMedium(
+                          text: 'Password Name',
+                          fontWeight: FontWeight.normal,
+                        ),
+                                          ),
+                      ) ,
+                 SizedBox(
+                     width: MediaQuery.of(context).size.width / 2.6,
+                     child: TextFormField(
+                       controller:
+                       BlocProvider.of<SmartDoorBloc>(context).passwordNameController,
+                       decoration: const InputDecoration(hintText: 'Enter The Name',hintStyle:
+                       TextStyle(fontSize: 14,color: ColorsManager.textGray)),
+               )),],
+          ), const  Divider(color:ColorsManager.graysColor,),
+                Padding(
+                  padding: const EdgeInsets.all(10.0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+
+                    children: [
+                      const Expanded(
+                        child: BodyMedium(
+                          text: 'Effective Time',
+                          fontWeight: FontWeight.normal,
+                        ),
+                      ),
+                      SizedBox(
+                          width: MediaQuery.of(context).size.width / 4,
+                          child: InkWell(
+                            onTap: () {
+                              BlocProvider.of<SmartDoorBloc>(context)..add(SelectTimeEvent(context: context, isEffective: true));
+                              },
+                            child: Text(
+                                BlocProvider.of<SmartDoorBloc>(context).effectiveTime,style:  TextStyle(fontSize: 14,color:BlocProvider.of<SmartDoorBloc>(context)
+                                .expirationTime!='Select Time'?ColorsManager.blackColor:ColorsManager.textGray),),
+                          )),
+                    ],
+                  ),
+                ),
                           const  Divider(color:ColorsManager.graysColor,),
-                          ListTile(
-                            contentPadding: EdgeInsets.zero,
-                            leading: const BodyMedium(
-                              text: 'Effective Time',
-                              fontWeight: FontWeight.normal,
-                            ),
-                            trailing: SizedBox(
-                                width: MediaQuery.of(context).size.width / 2,
-                                child: InkWell(
-                                  onTap: () {
-                                    BlocProvider.of<SmartDoorBloc>(context)..add(SelectTimeEvent(context: context, isEffective: true));
-                                        // .selectTime(context, isEffective: true);
-                                    },
-                                  child: Text(
-                                      BlocProvider.of<SmartDoorBloc>(context).effectiveTime
+                          Padding(
+                            padding: const EdgeInsets.all(10.0),
+                            child: Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                const Expanded(
+                                  child: BodyMedium(
+                                    text: 'Expiration Time',
+                                    fontWeight: FontWeight.normal,
                                   ),
-                                )),
-                          ),
-                          const  Divider(color:ColorsManager.graysColor,),
-                          ListTile(
-                            contentPadding: EdgeInsets.zero,
-                            leading: const BodyMedium(
-                              text: 'Expiration Time',
-                              fontWeight: FontWeight.normal,
-                            ),
-                            trailing: SizedBox(
-                              width: MediaQuery.of(context).size.width / 2,
-                              child: SizedBox(
-                                  width: MediaQuery.of(context).size.width / 2,
+                                ),
+                                SizedBox(
+                                  width: MediaQuery.of(context).size.width / 4,
                                   child: InkWell(
                                     onTap: () {
                                       BlocProvider.of<SmartDoorBloc>(context)..add(SelectTimeEvent(context: context, isEffective: false));
                                     },
                                     child: Text(
-                                        BlocProvider.of<SmartDoorBloc>(context)
-                                            .expirationTime),
-                                  )),
+                                      BlocProvider.of<SmartDoorBloc>(context)
+                                          .expirationTime,style:  TextStyle(fontSize: 14,color:
+
+
+                                    BlocProvider.of<SmartDoorBloc>(context)
+                                        .expirationTime!='Select Time'?ColorsManager.blackColor:ColorsManager.textGray),),
+                                  ),
+                                ),
+                              ],
+
                             ),
                           ),
                         ],
@@ -260,6 +283,7 @@ class CreateTemporaryPassword extends StatelessWidget {
                                   itemHeight: 40,
                                   normalTextStyle: const TextStyle(
                                     color: Colors.grey,
+
                                     fontSize: 24,
                                   ),
                                   highlightedTextStyle: const TextStyle(
diff --git a/lib/utils/resource_manager/color_manager.dart b/lib/utils/resource_manager/color_manager.dart
index 3e16f78..6c0ea6b 100644
--- a/lib/utils/resource_manager/color_manager.dart
+++ b/lib/utils/resource_manager/color_manager.dart
@@ -23,4 +23,5 @@ abstract class ColorsManager {
   static const Color lightGreen = Color(0xFF00FF0A);
   static const Color grayColor = Color(0xFF999999);
   static const Color graysColor = Color(0xffEBEBEB);
+  static const Color textGray = Color(0xffD5D5D5);
 }