diff --git a/src/assets/styles/common-dialogs.scss b/src/assets/styles/common-dialogs.scss
index 04dbde9..64f4742 100644
--- a/src/assets/styles/common-dialogs.scss
+++ b/src/assets/styles/common-dialogs.scss
@@ -72,3 +72,7 @@
         margin-left: auto;
     }
 }
+
+.large-form-dialog .dialog > form {
+    display: contents;
+}
diff --git a/src/lib/dialog/iqser-dialog-component.directive.ts b/src/lib/dialog/iqser-dialog-component.directive.ts
index c983363..069f7cc 100644
--- a/src/lib/dialog/iqser-dialog-component.directive.ts
+++ b/src/lib/dialog/iqser-dialog-component.directive.ts
@@ -2,9 +2,8 @@ import { Directive, HostListener, inject } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormGroup } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';
-import { IconButtonTypes } from '../buttons/types/icon-button.type';
-import { hasFormChanged } from '../utils/functions';
-import { IqserEventTarget } from '../utils/types/events.type';
+import { IconButtonTypes } from '../buttons';
+import { hasFormChanged, IqserEventTarget } from '../utils';
 
 const DIALOG_CONTAINER = 'mat-dialog-container';
 const DATA_TYPE_SYMBOL = Symbol.for('DATA_TYPE');
@@ -14,7 +13,7 @@ export type DATA_TYPE = typeof DATA_TYPE_SYMBOL;
 export type RETURN_TYPE = typeof RETURN_TYPE_SYMBOL;
 
 @Directive()
-export abstract class IqserDialogComponent<ComponentType, DataType, ReturnType> {
+export abstract class IqserDialogComponent<ComponentType, DataType = null, ReturnType = void> {
     readonly [DATA_TYPE_SYMBOL]!: DataType;
     readonly [RETURN_TYPE_SYMBOL]!: ReturnType;
 
diff --git a/src/lib/listing/table-column-name/table-column-name.component.scss b/src/lib/listing/table-column-name/table-column-name.component.scss
index 46aa2fc..c255f93 100644
--- a/src/lib/listing/table-column-name/table-column-name.component.scss
+++ b/src/lib/listing/table-column-name/table-column-name.component.scss
@@ -22,14 +22,14 @@
         }
     }
 
-    &:first-child > div {
-        padding: 0 24px;
-    }
-
     &:last-of-type > div {
         padding: 0 13px 0 10px;
     }
 
+    &:first-child > div {
+        padding: 0 24px;
+    }
+
     .flex-end {
         min-width: 58px;
     }