diff --git a/src/__tests__/components/dialog/edit-widget-control-creator.js b/src/__tests__/components/dialog/edit-widget-control-creator.js
index fea0b2a..457bbb6 100644
--- a/src/__tests__/components/dialog/edit-widget-control-creator.js
+++ b/src/__tests__/components/dialog/edit-widget-control-creator.js
@@ -10,23 +10,26 @@ import EditWidgetSimulatorControl from '../../../components/dialog/edit-widget-s
 import EditWidgetSignalControl from '../../../components/dialog/edit-widget-signal-control';
 import EditWidgetSignalsControl from '../../../components/dialog/edit-widget-signals-control';
 import EditWidgetOrientation from '../../../components/dialog/edit-widget-orientation';
+import EditWidgetTextSizeControl from '../../../components/dialog/edit-widget-text-size-control';
+import EditWidgetAspectControl from '../../../components/dialog/edit-widget-aspect-control';
 
 describe('edit widget control creator', () => {
     it('should not return null', () => {
         let controls = createControls('Value', null, null, null, null, null, null);
-        expect(controls).to.be.defined;
+        expect(controls).to.be.not.undefined;
     });
 
     var runs = [
-        { args: { widgetType: 'Value' }, result: { controlNumber: 2, controlTypes: [EditWidgetSimulatorControl, EditWidgetSignalControl] } },
+        { args: { widgetType: 'Value' }, result: { controlNumber: 4, controlTypes: [EditWidgetTextControl, EditWidgetSimulatorControl, EditWidgetSignalControl, EditWidgetTextSizeControl] } },
         { args: { widgetType: 'Plot' }, result: { controlNumber: 4, controlTypes: [EditWidgetTimeControl, EditWidgetSimulatorControl, EditWidgetSignalsControl, EditWidgetTextControl] } },
         { args: { widgetType: 'Table' }, result: { controlNumber: 1, controlTypes: [EditWidgetSimulatorControl] } },
-        { args: { widgetType: 'Image' }, result: { controlNumber: 1, controlTypes: [EditImageWidgetControl] } },
+        { args: { widgetType: 'Image' }, result: { controlNumber: 2, controlTypes: [EditImageWidgetControl, EditWidgetAspectControl] } },
         { args: { widgetType: 'Gauge' }, result: { controlNumber: 2, controlTypes: [EditWidgetSimulatorControl, EditWidgetSignalControl] } },
         { args: { widgetType: 'PlotTable' }, result: { controlNumber: 3, controlTypes: [EditWidgetSimulatorControl, EditWidgetSignalsControl, EditWidgetTextControl] } },
         { args: { widgetType: 'Slider' }, result: { controlNumber: 1, controlTypes: [EditWidgetOrientation] } },
         { args: { widgetType: 'Button' }, result: { controlNumber: 2, controlTypes: [EditWidgetColorControl] } },
         { args: { widgetType: 'Box' }, result: { controlNumber: 1, controlTypes: [EditWidgetColorControl] } },
+        { args: { widgetType: 'Label' }, result: { controlNumber: 3, controlTypes: [EditWidgetTextControl, EditWidgetTextSizeControl, EditWidgetColorControl] } }
     ];
 
     runs.forEach( (run) => {
diff --git a/src/components/dialog/edit-widget-control-creator.js b/src/components/dialog/edit-widget-control-creator.js
index 7a12b29..b9305a6 100644
--- a/src/components/dialog/edit-widget-control-creator.js
+++ b/src/components/dialog/edit-widget-control-creator.js
@@ -42,9 +42,10 @@ export default function createControls(widgetType = null, widget = null, session
                 handleChange([e, {target: {id: 'signal', value: 0}}]);
             }
             dialogControls.push(
-                <EditWidgetSimulatorControl key={1} widget={widget} validate={(id) => validateForm(id)} simulation={simulation} handleChange={(e) => valueBoundOnChange(e)} />,
-                <EditWidgetSignalControl key={2} widget={widget} validate={(id) => validateForm(id)} simulation={simulation} handleChange={(e) => handleChange(e)} />,
-                <EditWidgetTextSizeControl key={3} widget={widget} handleChange={e => handleChange(e)} />
+                <EditWidgetTextControl key={1} widget={widget} controlId={'name'} label={'Text'} placeholder={'Enter text'} validate={id => validateForm(id)} handleChange={e => handleChange(e)} />,
+                <EditWidgetSimulatorControl key={2} widget={widget} validate={(id) => validateForm(id)} simulation={simulation} handleChange={(e) => valueBoundOnChange(e)} />,
+                <EditWidgetSignalControl key={3} widget={widget} validate={(id) => validateForm(id)} simulation={simulation} handleChange={(e) => handleChange(e)} />,
+                <EditWidgetTextSizeControl key={4} widget={widget} handleChange={e => handleChange(e)} />
             );
         break;
         case 'Plot':