diff --git a/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml b/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml
index 97cf9e6..b8b39d9 100644
--- a/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml
+++ b/KeyboardAudioVisualizer/UI/ConfigurationWindow.xaml
@@ -54,19 +54,23 @@
 
         <TabItem Header="Settings">
             <GroupBox VerticalAlignment="Top">
-                <controls:Formular>
-                    <controls:Formular.Resources>
-                        <Style BasedOn="{StaticResource StyleLabelFormular}" TargetType="Label" />
-                        <Style BasedOn="{StaticResource StyleTextBlockFormular}" TargetType="TextBlock" />
-                        <Style BasedOn="{StaticResource StyleListBoxFormular}" TargetType="ListBox" />
-                    </controls:Formular.Resources>
+                <StackPanel Orientation="Vertical">
+                    <controls:Formular>
+                        <controls:Formular.Resources>
+                            <Style BasedOn="{StaticResource StyleLabelFormular}" TargetType="Label" />
+                            <Style BasedOn="{StaticResource StyleTextBlockFormular}" TargetType="TextBlock" />
+                            <Style BasedOn="{StaticResource StyleListBoxFormular}" TargetType="ListBox" />
+                        </controls:Formular.Resources>
 
-                    <Label controls:Formular.IsLabel="True" Content="Version:" />
-                    <TextBlock Text="{Binding Version}" />
+                        <Label controls:Formular.IsLabel="True" Content="Version:" />
+                        <TextBlock Text="{Binding Version}" />
 
-                    <Label controls:Formular.LineBreaks="1" controls:Formular.IsLabel="True" Content="Connected Devices:" />
-                    <ListBox Width="400" ItemsSource="{Binding Source={x:Static core:RGBSurface.Instance}, Path=Devices}">
-                        <ListBox.ItemTemplate>
+                        <Label controls:Formular.LineBreaks="1" controls:Formular.IsLabel="True" Content="Connected Devices:" />
+                    </controls:Formular>
+
+                    <!-- TODO DarthAffe 05.08.2017: Fix the formular to support that use-case -->
+                    <ItemsControl VerticalAlignment="Top" HorizontalAlignment="Left" Margin="168,-22,0,0" ItemsSource="{Binding Source={x:Static core:RGBSurface.Instance}, Path=Devices}">
+                        <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Style="{StaticResource StyleTextBlockFormular}">
                                     <TextBlock.Text>
@@ -78,9 +82,9 @@
                                     </TextBlock.Text>
                                 </TextBlock>
                             </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </controls:Formular>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </StackPanel>
             </GroupBox>
         </TabItem>
     </TabControl>