diff --git a/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml b/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml
index c218ce2..6261948 100644
--- a/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml
+++ b/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml
@@ -16,20 +16,31 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <GroupBox Grid.Row="0" Grid.Column="0" Header="SplitFlap Configuration">
+        <!-- SPLITFLAP -->
+        <GroupBox Grid.Row="0" Grid.Column="0" Header="SplitFlaps">
             <DockPanel>
-                <Label DockPanel.Dock="Top">Configure Hardware IDs:</Label>
-                <Label VerticalAlignment="Center">0:</Label>
-                <TextBox x:Name="tbSf1" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
-                <Label VerticalAlignment="Center">1:</Label>
-                <TextBox x:Name="tbSf2" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
-                <Label VerticalAlignment="Center">2:</Label>
-                <TextBox x:Name="tbSf3" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
-                <Label VerticalAlignment="Center">3:</Label>
-                <TextBox x:Name="tbSf4" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
-                <Button x:Name="btnApplyConfiguration" Content="Apply" HorizontalAlignment="Right" Height="30" Width="100" Margin="10" Click="btnApplyConfiguration_Click"/>
+                <GroupBox DockPanel.Dock="Left" Header="Configure Hardware IDs">
+                    <DockPanel>
+                        <Label VerticalAlignment="Center">0:</Label>
+                        <TextBox x:Name="tbSf1" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
+                        <Label VerticalAlignment="Center">1:</Label>
+                        <TextBox x:Name="tbSf2" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
+                        <Label VerticalAlignment="Center">2:</Label>
+                        <TextBox x:Name="tbSf3" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
+                        <Label VerticalAlignment="Center">3:</Label>
+                        <TextBox x:Name="tbSf4" TextAlignment="Center" Width="30" Height="30" Margin="10 0"></TextBox>
+                        <Button x:Name="btnApplyConfiguration" Content="Apply" HorizontalAlignment="Right" Height="30" Width="100" Margin="10" Click="btnApplyConfiguration_Click"/>
+                    </DockPanel>
+                </GroupBox>
+                <GroupBox Header="Move to zero position">
+                    <DockPanel>
+                        <Button x:Name="btnInitSplitflaps" Content="Move to Zero" HorizontalAlignment="Left" Height="30" Width="100" Margin="10" Click="btnInitSplitflaps_Click"/>
+                    </DockPanel>
+                </GroupBox>
             </DockPanel>
         </GroupBox>
+        
+        <!-- LINE SENSOR -->
         <GroupBox Grid.Row="1" Grid.Column="0" Header="Line Sensor calibration">
             <DockPanel>
                 <StackPanel DockPanel.Dock="Left" Orientation="Vertical">
@@ -37,17 +48,25 @@
                     <Button x:Name="btnEndCalibration" Content="End Calibration" Margin="5" Width="200" Height="30" Click="btnEndCalibration_Click" />
                 </StackPanel>
 
-                <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="5" >
-                    <Label Content="Calibration state:"/>
-                    <TextBox x:Name="tbCalibrationState" IsReadOnly="True" Width="200" Height="30"/>
-                </StackPanel>
+                <Grid Margin="5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
 
-                <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="5" >
-                    <Label Content="Calibration data:"/>
-                    <TextBox x:Name="tbCalibrationData" IsReadOnly="True" Width="500" Height="30"/>
-                </StackPanel>
+                
+                    <Label Grid.Row="0" Grid.Column="0" Content="Calibration state:" />
+                    <TextBox Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" x:Name="tbCalibrationState" IsReadOnly="True" Width="200" Height="30"/>
+                    <Label Grid.Row="1" Grid.Column="0" Content="Calibration data:" />
+                    <TextBox Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" x:Name="tbCalibrationData" IsReadOnly="True" Width="500" Height="30" />
 
-                <Button x:Name="btnGetCalibrationData" DockPanel.Dock="Right" Content="Get State" Margin="10 0" Width="100" Height="30" Click="btnGetCalibrationData_Click"/>
+                    <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" x:Name="btnGetCalibrationData" DockPanel.Dock="Right" Content="Refresh" Margin="10 0" Width="100" Height="30" Click="btnGetCalibrationData_Click"/>
+                </Grid>
             </DockPanel>
         </GroupBox>
     </Grid>
diff --git a/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml.cs b/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml.cs
index 7a6ed08..941dba9 100644
--- a/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml.cs
+++ b/ADIS_Csharp/RobotClientWpf/Views/ConfigView.xaml.cs
@@ -84,5 +84,10 @@ namespace RobotClientWpf.Views
             UIAccessHelpers.SetTextboxText(this.tbCalibrationData, e.CalibrationValues);
             UIAccessHelpers.SetTextboxText(this.tbCalibrationState, e.State);
         }
+
+        private void btnInitSplitflaps_Click(object sender, RoutedEventArgs e)
+        {
+            this.challenge?.RobotStationary.SplitFlap.InitializeAllSplitflaps();
+        }
     }
 }