diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index 3f7cc598..ef20fa56 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -54,150 +54,139 @@ class CreateSubSpaceDialog extends StatelessWidget {
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(
+              width: context.screenWidth * 0.35,
               color: ColorsManager.whiteColors,
-              child: SizedBox(
-                width: context.screenWidth * 0.35,
-                child: Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Text(
-                        dialogTitle,
-                        style: Theme.of(context).textTheme.headlineLarge?.copyWith(
-                              color: ColorsManager.blackColor,
-                            ),
-                      ),
-                      const SizedBox(height: 16),
-                      Container(
-                        width: context.screenWidth * 0.35,
-                        padding: const EdgeInsets.symmetric(
-                          vertical: 10.0,
-                          horizontal: 16.0,
-                        ),
-                        decoration: BoxDecoration(
-                          color: ColorsManager.boxColor,
-                          borderRadius: BorderRadius.circular(10),
-                        ),
-                        child: Wrap(
-                          spacing: 8,
-                          runSpacing: 8,
-                          alignment: WrapAlignment.start,
-                          crossAxisAlignment: WrapCrossAlignment.center,
-                          children: [
-                            ...state.subSpaces.asMap().entries.map(
-                              (entry) {
-                                final index = entry.key;
-                                final subSpace = entry.value;
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    dialogTitle,
+                    style: context.textTheme.headlineLarge?.copyWith(
+                      color: ColorsManager.blackColor,
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  Container(
+                    width: context.screenWidth * 0.35,
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
+                    decoration: BoxDecoration(
+                      color: ColorsManager.boxColor,
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Wrap(
+                      spacing: 8,
+                      runSpacing: 8,
+                      alignment: WrapAlignment.start,
+                      crossAxisAlignment: WrapCrossAlignment.center,
+                      children: [
+                        ...state.subSpaces.asMap().entries.map(
+                          (entry) {
+                            final index = entry.key;
+                            final subSpace = entry.value;
 
-                                final lowerName =
-                                    subSpace.subspaceName.toLowerCase();
+                            final lowerName = subSpace.subspaceName.toLowerCase();
 
-                                final duplicateIndices = state.subSpaces
-                                    .asMap()
-                                    .entries
-                                    .where((e) =>
-                                        e.value.subspaceName.toLowerCase() ==
-                                        lowerName)
-                                    .map((e) => e.key)
-                                    .toList();
-                                final isDuplicate = duplicateIndices.length > 1 &&
-                                    duplicateIndices.indexOf(index) != 0;
-                                return SubspaceChip(
-                                  subSpace: SubspaceTemplateModel(
-                                    subspaceName: entry.value.subspaceName,
-                                    disabled: entry.value.disabled,
+                            final duplicateIndices = state.subSpaces
+                                .asMap()
+                                .entries
+                                .where((e) =>
+                                    e.value.subspaceName.toLowerCase() == lowerName)
+                                .map((e) => e.key)
+                                .toList();
+                            final isDuplicate = duplicateIndices.length > 1 &&
+                                duplicateIndices.indexOf(index) != 0;
+                            return SubspaceChip(
+                              subSpace: SubspaceTemplateModel(
+                                subspaceName: entry.value.subspaceName,
+                                disabled: entry.value.disabled,
+                              ),
+                              isDuplicate: isDuplicate,
+                              onDeleted: () => context.read<SubSpaceBloc>().add(
+                                    RemoveSubSpace(subSpace),
                                   ),
-                                  isDuplicate: isDuplicate,
-                                  onDeleted: () => context.read<SubSpaceBloc>().add(
-                                        RemoveSubSpace(subSpace),
-                                      ),
-                                );
-                              },
-                            ),
-                            SizedBox(
-                              width: 200,
-                              child: TextField(
-                                controller: textController,
-                                decoration: InputDecoration(
-                                  border: InputBorder.none,
-                                  hintText: state.subSpaces.isEmpty
-                                      ? 'Please enter the name'
-                                      : null,
-                                  hintStyle: Theme.of(context)
-                                      .textTheme
-                                      .bodySmall
-                                      ?.copyWith(
-                                        color: ColorsManager.lightGrayColor,
-                                      ),
-                                ),
-                                onSubmitted: (value) {
-                                  if (value.trim().isNotEmpty) {
-                                    context.read<SubSpaceBloc>().add(
-                                          AddSubSpace(
-                                            SubspaceModel(
-                                              subspaceName: value.trim(),
-                                              disabled: false,
-                                            ),
-                                          ),
-                                        );
-                                    textController.clear();
-                                  }
-                                },
-                                style: Theme.of(context).textTheme.bodyMedium,
+                            );
+                          },
+                        ),
+                        SizedBox(
+                          width: 200,
+                          child: TextField(
+                            controller: textController,
+                            decoration: InputDecoration(
+                              border: InputBorder.none,
+                              hintText: state.subSpaces.isEmpty
+                                  ? 'Please enter the name'
+                                  : null,
+                              hintStyle: context.textTheme.bodySmall?.copyWith(
+                                color: ColorsManager.lightGrayColor,
                               ),
                             ),
-                          ],
+                            onSubmitted: (value) {
+                              if (value.trim().isNotEmpty) {
+                                context.read<SubSpaceBloc>().add(
+                                      AddSubSpace(
+                                        SubspaceModel(
+                                          subspaceName: value.trim(),
+                                          disabled: false,
+                                        ),
+                                      ),
+                                    );
+                                textController.clear();
+                              }
+                            },
+                            style: context.textTheme.bodyMedium,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  if (state.errorMessage.isNotEmpty)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                        state.errorMessage,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: ColorsManager.warningRed,
                         ),
                       ),
-                      if (state.errorMessage.isNotEmpty)
-                        Padding(
-                          padding: const EdgeInsets.only(top: 8.0),
-                          child: Text(
-                            state.errorMessage,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  color: ColorsManager.warningRed,
-                                ),
-                          ),
+                    ),
+                  const SizedBox(height: 16),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: CancelButton(
+                          label: 'Cancel',
+                          onPressed: () async {
+                            Navigator.of(context).pop();
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: DefaultButton(
+                          onPressed: state.errorMessage.isEmpty
+                              ? () {
+                                  final subSpacesBloc = context.read<SubSpaceBloc>();
+                                  final subSpaces = subSpacesBloc.state.subSpaces;
+                                  onSave?.call(subSpaces);
+                                  Navigator.of(context).pop();
+                                }
+                              : null,
+                          backgroundColor: ColorsManager.secondaryColor,
+                          borderRadius: 10,
+                          foregroundColor: state.errorMessage.isNotEmpty
+                              ? ColorsManager.whiteColorsWithOpacity
+                              : ColorsManager.whiteColors,
+                          child: const Text('OK'),
                         ),
-                      const SizedBox(height: 16),
-                      Row(
-                        children: [
-                          Expanded(
-                            child: CancelButton(
-                              label: 'Cancel',
-                              onPressed: () async {
-                                Navigator.of(context).pop();
-                              },
-                            ),
-                          ),
-                          const SizedBox(width: 10),
-                          Expanded(
-                            child: DefaultButton(
-                              onPressed: (state.errorMessage.isNotEmpty)
-                                  ? null
-                                  : () async {
-                                      final subSpaces = context
-                                          .read<SubSpaceBloc>()
-                                          .state
-                                          .subSpaces;
-                                      onSave!(subSpaces);
-                                      Navigator.of(context).pop();
-                                    },
-                              backgroundColor: ColorsManager.secondaryColor,
-                              borderRadius: 10,
-                              foregroundColor: state.errorMessage.isNotEmpty
-                                  ? ColorsManager.whiteColorsWithOpacity
-                                  : ColorsManager.whiteColors,
-                              child: const Text('OK'),
-                            ),
-                          ),
-                        ],
                       ),
                     ],
                   ),
-                ),
+                ],
               ),
             );
           },