diff --git a/Torch/Views/ObjectCollectionEditor.xaml b/Torch/Views/ObjectCollectionEditor.xaml
index 72f899f..45f1a68 100644
--- a/Torch/Views/ObjectCollectionEditor.xaml
+++ b/Torch/Views/ObjectCollectionEditor.xaml
@@ -5,15 +5,24 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Torch.Views"
         mc:Ignorable="d"
-        Height="370" Width="410" Title="Edit Collection">
-    <Grid>
-        <local:PropertyGrid x:Name="PGrid" VerticalAlignment="Top" Height="300" Width="190" Margin="200,0,0,0"
-                            HorizontalAlignment="Right" />
-        <ListBox x:Name="ElementList" Height="300" VerticalAlignment="Top" Width="190"
-                 HorizontalContentAlignment="Stretch" Margin="0,0,210,0" HorizontalAlignment="Left" />
-        <Button x:Name="AddButton" Content="Add" HorizontalAlignment="Left" Margin="0,305,0,0" VerticalAlignment="Top"
+        Height="370" Width="400" Title="Edit Collection">
+    <Grid Width="Auto" Height="Auto">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="25"/>
+        </Grid.RowDefinitions>
+        <ListBox Grid.Row="0" Grid.Column="0" x:Name="ElementList"
+                 HorizontalContentAlignment="Stretch" Margin="0" VerticalContentAlignment="Stretch" />
+            <GridSplitter Grid.Column="1" Grid.Row="0" Width="2" HorizontalAlignment="Left" VerticalAlignment="Stretch" Background="Gray" ShowsPreview="True" VerticalContentAlignment="Stretch"/>
+        
+        <local:PropertyGrid Grid.Row="0" Grid.Column="1" x:Name="PGrid" Margin="4,0,0,0"  />
+        <Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="AddButton" Content="Add" HorizontalAlignment="Left" Margin="0" VerticalAlignment="Top"
                 Width="90" />
-        <Button x:Name="RemoveButton" Content="Remove" HorizontalAlignment="Left" Margin="100,305,0,0"
+        <Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="RemoveButton" Content="Remove" HorizontalAlignment="Left" Margin="100,0,0,0"
                 VerticalAlignment="Top" Width="90" />
 
     </Grid>