diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index 087a69a75c..6ee1766db7 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -10,11 +10,11 @@
         *ngFor="let feature of features$ | async; let i = index"
         [ngSwitch]="feature.valueType.name"
       >
-        <div class="col-4">{{ feature.name }}</div>
-        <div class="col-8" *ngSwitchCase="'ToggleStringValueType'">
+        <div class="mr-2">{{ feature.displayName }}</div>
+        <div *ngSwitchCase="'ToggleStringValueType'">
           <input type="checkbox" name="feature.name" [formControlName]="i" />
         </div>
-        <div class="col-8" *ngSwitchCase="'FreeTextStringValueType'">
+        <div *ngSwitchCase="'FreeTextStringValueType'">
           <input type="text" name="feature.name" [formControlName]="i" />
         </div>
       </div>
diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
index b8aba035bd..cd4d00491b 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
@@ -87,8 +87,8 @@ export class FeatureManagementComponent
     let features = this.store.selectSnapshot(FeatureManagementState.getFeatures);
 
     features = features.map((feature, i) => ({
-      name: feature.name,
-      value: !this.form.value[i] || this.form.value[i] === 'false' ? null : this.form.value[i],
+      ...feature,
+      value: this.form.value[i],
     }));
 
     this.store
diff --git a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts
index fa0165ae2e..02f6f687e2 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/models/feature-management.ts
@@ -13,6 +13,7 @@ export namespace FeatureManagement {
 
   export interface Feature {
     name: string;
+    displayName: string;
     value: string;
     description?: string;
     valueType?: ValueType;