diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 1821266cc..fc62c1b72 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -136,6 +136,9 @@
       <HintPath>..\packages\Caliburn.Micro.2.0.2\lib\net45\Caliburn.Micro.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ColorBox">
+      <HintPath>lib\ColorBox.dll</HintPath>
+    </Reference>
     <Reference Include="Corale.Colore, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Colore.4.0.0\lib\net35\Corale.Colore.dll</HintPath>
       <Private>True</Private>
diff --git a/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs b/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs
index 2d43aa8b8..64e8a41e9 100644
--- a/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs
+++ b/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs
@@ -80,7 +80,7 @@ namespace Artemis.ViewModels
             {
                 // For the preview, put the proposed properties into the calculated properties
                 _layer.LayerCalculatedProperties = ProposedProperties;
-                var bitmap = new Bitmap(ProposedProperties.Width, ProposedProperties.Height);
+                var bitmap = new Bitmap(ProposedProperties.Width*4, ProposedProperties.Height*4);
 
                 using (var g = Graphics.FromImage(bitmap))
                 {
diff --git a/Artemis/Artemis/Views/LayerEditorView.xaml b/Artemis/Artemis/Views/LayerEditorView.xaml
index f106761d9..c7607a9f2 100644
--- a/Artemis/Artemis/Views/LayerEditorView.xaml
+++ b/Artemis/Artemis/Views/LayerEditorView.xaml
@@ -150,8 +150,8 @@
         <TextBlock Grid.Row="9" Grid.Column="2" Margin="10" FontSize="13.333" Text="Rotation speed:"
                    VerticalAlignment="Center" Height="18" />
         <Slider x:Name="RotationSpeed" Grid.Row="9" Grid.Column="3" VerticalAlignment="Center"
-                TickPlacement="BottomRight" TickFrequency="1"
-                Value="{Binding Path=ProposedProperties.RotateSpeed, Mode=TwoWay}" Minimum="1" Maximum="10"
+                TickPlacement="BottomRight" TickFrequency="0.1"
+                Value="{Binding Path=ProposedProperties.RotateSpeed, Mode=TwoWay}" Minimum="0.1" Maximum="3"
                 SmallChange="1" IsSnapToTickEnabled="True" Margin="10,7" Height="24" />
 
         <!-- Color direction -->
@@ -212,7 +212,7 @@
         <!-- Preview -->
         <TextBlock Grid.Row="11" Grid.Column="0" Margin="10,13,10,0" FontSize="13.333" Text="Preview:"
                    VerticalAlignment="Top" Height="18" />
-        <Image Grid.Row="11" Grid.Column="1" Grid.ColumnSpan="2" Margin="10" Source="{Binding LayerImage}" />
+        <Image Grid.Row="11" Grid.Column="1" Grid.ColumnSpan="2" Margin="10" Source="{Binding LayerImage}" Stretch="Uniform" Width="280" Height="105"/>
 
         <Button Grid.Row="12" Grid.Column="0" x:Name="Apply" Content="Apply" VerticalAlignment="Bottom"
                 Style="{DynamicResource SquareButtonStyle}" Width="95" HorizontalAlignment="Left" Margin="10,0,0,20"
diff --git a/Artemis/Artemis/lib/ColorBox.dll b/Artemis/Artemis/lib/ColorBox.dll
new file mode 100644
index 000000000..d4bbf95f3
Binary files /dev/null and b/Artemis/Artemis/lib/ColorBox.dll differ