diff --git a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
index 88956db..f69b532 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
@@ -25,7 +25,8 @@
         xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
         xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:converter="clr-namespace:Bovender.Mvvm.Converters;assembly=Bovender"
-        SizeToContent="Height" Width="700"
+        SizeToContent="Height" Width="700" ShowInTaskbar="False"
+        WindowStyle="ToolWindow" Topmost="True" ResizeMode="CanResizeWithGrip"
         x:Name="exceptionDetailView"
         Title="Technische Fehlerdetails"
         settings:WindowState.Save="True"
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
index 64e6e0e..7154fcd 100755
--- a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
@@ -27,6 +27,7 @@
         xmlns:actions="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
         xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip"
+        WindowStyle="ToolWindow" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterScreen"
         Title="zaaReloaded2: Fehler!"
         settings:WindowState.Save="True"
diff --git a/zaaReloaded2/Views/ElementPickerView.xaml b/zaaReloaded2/Views/ElementPickerView.xaml
index 24d865a..947a719 100755
--- a/zaaReloaded2/Views/ElementPickerView.xaml
+++ b/zaaReloaded2/Views/ElementPickerView.xaml
@@ -21,17 +21,21 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
-        SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        Width="280" Height="320" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        WindowStyle="ToolWindow" Topmost="True"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Neues Element auswählen"
         >
     <Window.Resources>
         <ResourceDictionary Source="/zaaReloaded2;component/Style.xaml" />
     </Window.Resources>
-    <StackPanel Margin="10">
-        <Label Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
-        <!-- TODO: Expand tree by default. -->
-        <TreeView ItemsSource="{Binding Categories}" Height="120">
+    <DockPanel Margin="10">
+        <Label DockPanel.Dock="Top" Content="Verfügbare Elemente:" Target="{Binding ElementName=ElementsTreeView}" />
+        <UniformGrid DockPanel.Dock="Bottom" HorizontalAlignment="Right" Columns="2" Rows="1" Margin="0 10 0 0">
+            <Button Content="OK" Command="{Binding ChooseElementCommand}" IsDefault="True" Margin="0 0 5 0" />
+            <Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="5 0 0 0" />
+        </UniformGrid>
+        <TreeView ItemsSource="{Binding Categories}">
             <TreeView.ItemContainerStyle>
                 <Style TargetType="{x:Type TreeViewItem}">
                     <Setter Property="IsExpanded" Value="True" />
@@ -44,9 +48,5 @@
                 </HierarchicalDataTemplate>
             </TreeView.ItemTemplate>
         </TreeView>
-        <UniformGrid Columns="2" Rows="1" Margin="0 10 0 0">
-            <Button Content="OK" Command="{Binding ChooseElementCommand}" IsDefault="True" Margin="0 0 10 0" />
-            <Button Content="Abbrechen" Command="{Binding CloseViewCommand}" IsCancel="True" Margin="10 0 0 0" />
-        </UniformGrid>
-    </StackPanel>
+    </DockPanel>
 </Window>
diff --git a/zaaReloaded2/Views/ElementView.xaml b/zaaReloaded2/Views/ElementView.xaml
index f508eb0..3212ec7 100755
--- a/zaaReloaded2/Views/ElementView.xaml
+++ b/zaaReloaded2/Views/ElementView.xaml
@@ -22,6 +22,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        WindowStyle="ToolWindow" Topmost="True"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Element bearbeiten"
         >
diff --git a/zaaReloaded2/Views/IoErrorView.xaml b/zaaReloaded2/Views/IoErrorView.xaml
index 3e52132..b5aa8bf 100755
--- a/zaaReloaded2/Views/IoErrorView.xaml
+++ b/zaaReloaded2/Views/IoErrorView.xaml
@@ -22,6 +22,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         SizeToContent="WidthAndHeight" MaxWidth="480"
+        WindowStyle="ToolWindow" Topmost="True"
         ResizeMode="NoResize" ShowInTaskbar="False"
         b:WindowState.CenterScreen="True"
         Title="Import/Export-Fehler"
diff --git a/zaaReloaded2/Views/SettingsRepositoryView.xaml b/zaaReloaded2/Views/SettingsRepositoryView.xaml
index 8fa8641..1c09f47 100755
--- a/zaaReloaded2/Views/SettingsRepositoryView.xaml
+++ b/zaaReloaded2/Views/SettingsRepositoryView.xaml
@@ -23,7 +23,7 @@
         xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
-        Width="340" Height="370"
+        Width="340" Height="370" Topmost="True"
         MinWidth="360" MinHeight="370" WindowStyle="ToolWindow"
         ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
diff --git a/zaaReloaded2/Views/SettingsView.xaml b/zaaReloaded2/Views/SettingsView.xaml
index 9ccb8c2..cf53d63 100755
--- a/zaaReloaded2/Views/SettingsView.xaml
+++ b/zaaReloaded2/Views/SettingsView.xaml
@@ -24,6 +24,7 @@
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
         Width="640" Height="480" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
+        WindowStyle="ToolWindow" Topmost="True"
         b:WindowState.CenterScreen="True" b:WindowState.Save="True"
         Title="Stil bearbeiten"
         >