diff --git a/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml b/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
index bba95b4..e4ce84c 100644
--- a/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
+++ b/MECF.Framework.UI.Client/CenterViews/Configs/SystemConfig/SystemConfigView.xaml
@@ -112,10 +112,10 @@
 
             <systemConfig:ConfigValueTemplateSelector.SelectionTemplate>
                 <DataTemplate>
-                    <Grid Width="140">
+                    <Grid>
                         <ComboBox
-                            Width="140"
-                            HorizontalAlignment="Center"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
                             ItemsSource="{Binding Options}"
                             SelectedValue="{Binding StringValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                             <ComboBox.ItemTemplate>
@@ -304,6 +304,7 @@
                 <DataGrid
                     Grid.Row="1"
                     Margin="0,5,0,0"
+                    ColumnWidth="*"
                     HorizontalAlignment="Stretch"
                     AutoGenerateColumns="False"
                     CanUserAddRows="False"
@@ -419,7 +420,7 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTemplateColumn MinWidth="120" Header="Unit">
+                        <DataGridTemplateColumn MinWidth="60" Header="Unit">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -435,7 +436,7 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTemplateColumn MinWidth="120" Header="Min">
+                        <DataGridTemplateColumn MinWidth="100" Header="Min">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -451,7 +452,7 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTemplateColumn MinWidth="120" Header="Max">
+                        <DataGridTemplateColumn MinWidth="100" Header="Max">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -466,7 +467,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn MinWidth="120" Header="PreviousValue">
+                        <DataGridTemplateColumn MinWidth="60" Header="PreviousValue">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -481,7 +482,7 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTemplateColumn MinWidth="200" Header="Value">
+                        <DataGridTemplateColumn MinWidth="60" Header="Value">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <TextBlock
@@ -498,9 +499,9 @@
                         </DataGridTemplateColumn>
 
                         <DataGridTemplateColumn
-                            MinWidth="140"
+                            MinWidth="60"
                             CellTemplateSelector="{StaticResource ConfigValueTemplateSelector}"
-                            Header="Setpoint" />
+                            Header="SetPoint" />
 
                         <DataGridTemplateColumn MinWidth="120">
                             <DataGridTemplateColumn.CellTemplate>