diff --git a/src/views/CreateNodule/CreateFilterNoduleForm.js b/src/views/CreateNodule/CreateFilterNoduleForm.js
index 1ea4476..d2378e4 100644
--- a/src/views/CreateNodule/CreateFilterNoduleForm.js
+++ b/src/views/CreateNodule/CreateFilterNoduleForm.js
@@ -64,24 +64,24 @@ class CreateFilterNoduleForm extends Component {
           onChange={this.handleChange}
         />
 
-        <Grid columns={2} relaxed='very' stackable>
+        <Grid columns={2} stackable>
           <Grid.Column>
             <List celled>
               { filterParamElements.filterKeyElements }
             </List>
-            <Input placeholder='Key' ref={this.keyInput} style={{ width: '115px' }} />
+            <Input placeholder='Key' ref={this.keyInput} fluid />
           </Grid.Column>
           <Grid.Column>
             <List celled>
               { filterParamElements.filterValueElements }
             </List>
-            <Input placeholder='Value' ref={this.valueInput} style={{ width: '115px' }} />
-            <Button animated='vertical' onClick={this.addKeyValueInput}>
-              <Button.Content hidden><Icon name='add' /></Button.Content>
-              <Button.Content visible>Add</Button.Content>
-            </Button>
+            <Input placeholder='Value' ref={this.valueInput} fluid />
           </Grid.Column>
         </Grid>
+        <Button fluid animated='vertical' onClick={this.addKeyValueInput}>
+          <Button.Content hidden><Icon name='add' /></Button.Content>
+          <Button.Content visible>Add</Button.Content>
+        </Button>
       </div>
     )
   }
diff --git a/src/views/CreateNodule/CreateNodule.js b/src/views/CreateNodule/CreateNodule.js
index 9764e6c..bbeef9d 100644
--- a/src/views/CreateNodule/CreateNodule.js
+++ b/src/views/CreateNodule/CreateNodule.js
@@ -99,6 +99,8 @@ class CreateNodule extends Component {
           fluid
         />
 
+        <TableSelect ref={this.tableSelect} />
+
         <Dropdown
           value ={this.state.noduleType}
           placeholder='Select a Nodule Type'
@@ -109,12 +111,9 @@ class CreateNodule extends Component {
           ]}
           fluid
           selection
-          fluid
           onChange={this.handleChange}
         />
 
-        <TableSelect ref={this.tableSelect} />
-
         { this.renderNoduleForm() }
 
         <div className='creatTableFormSubmitButtons'>
diff --git a/src/views/CreateNodule/CreateTransformNoduleForm.js b/src/views/CreateNodule/CreateTransformNoduleForm.js
index 433ad89..d665cbf 100644
--- a/src/views/CreateNodule/CreateTransformNoduleForm.js
+++ b/src/views/CreateNodule/CreateTransformNoduleForm.js
@@ -46,24 +46,24 @@ class CreateTransformNoduleForm extends Component {
     const structureElements = this.renderStructure()
     return (
       <div className='CreateFiltrerNoduleForm'>
-        <Grid columns={2} relaxed='very' stackable>
+        <Grid columns={2} stackable>
           <Grid.Column>
             <List celled>
               { structureElements.initialKeyElements }
             </List>
-            <Input placeholder='Initial Key' ref={this.initialKeyInput} style={{ width: '115px' }} />
+            <Input placeholder='Initial Key' ref={this.initialKeyInput} fluid />
           </Grid.Column>
           <Grid.Column>
             <List celled>
               { structureElements.newKeyElements }
             </List>
-            <Input placeholder='New Key' ref={this.newKeyInput} style={{ width: '115px' }} />
-            <Button animated='vertical' onClick={this.addStructureInput}>
+            <Input placeholder='New Key' ref={this.newKeyInput} fluid />
+          </Grid.Column>
+        </Grid>
+            <Button fluid animated='vertical' onClick={this.addStructureInput}>
               <Button.Content hidden><Icon name='add' /></Button.Content>
               <Button.Content visible>Add</Button.Content>
             </Button>
-          </Grid.Column>
-        </Grid>
       </div>
     )
   }