diff --git a/BFR/BFR.csproj b/BFR/BFR.csproj
index 5ca4a61..a028414 100644
--- a/BFR/BFR.csproj
+++ b/BFR/BFR.csproj
@@ -12,7 +12,7 @@
     </AvaloniaResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.0-preview7" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.0-preview7" />
+    <PackageReference Include="Avalonia" Version="0.9.0-preview8" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.0-preview8" />
   </ItemGroup>
 </Project>
diff --git a/BFR/MainWindow.xaml b/BFR/MainWindow.xaml
index 9b17ff9..311e748 100644
--- a/BFR/MainWindow.xaml
+++ b/BFR/MainWindow.xaml
@@ -35,17 +35,17 @@
     <TextBox Classes="HeaderTextBox" Grid.Row="1" Grid.Column="2" Text="After"/>
     
     <!-- Current and Preview ListBoxes -->
-    <ListBox Grid.Row="2" Grid.Column="0" Items="{Binding Files}" IsEnabled="False">
+    <ListBox Grid.Row="2" Grid.Column="0" Items="{Binding Files}">
       <ListBox.ItemTemplate>
         <DataTemplate>
-          <TextBlock Text="{Binding OldFullName}"/>
+          <TextBlock Text="{Binding OldFullName}" ToolTip.Tip="{Binding OldPath}" Background="Transparent"/>
         </DataTemplate>
       </ListBox.ItemTemplate>
     </ListBox>
-    <ListBox Grid.Row="2" Grid.Column="2" Items="{Binding Files}" IsEnabled="False">
+    <ListBox Grid.Row="2" Grid.Column="2" Items="{Binding Files}">
       <ListBox.ItemTemplate>
         <DataTemplate>
-          <TextBlock Text="{Binding FullName}"/>
+          <TextBlock Text="{Binding FullName}" ToolTip.Tip="{Binding Path}" Background="Transparent"/>
         </DataTemplate>
       </ListBox.ItemTemplate>
     </ListBox>
@@ -55,14 +55,11 @@
       <!-- Operations ListBox -->
       <ListBox Grid.Row="0" Items="{Binding Operations}" Name="OperationsListBox" SelectedIndex="{Binding SelectedOperation}"/>
       
-      <!-- Operations Controls -->
+      <!-- Add Operation -->
       <Border Grid.Row="1" Classes="ConnectUp">
-        <Grid ColumnDefinitions="auto,*,auto,auto,auto">
-          <TextBlock Grid.Column="0" Text="New:"/>
-          <ComboBox Grid.Column="1" Items="{Binding OperationTypes}" SelectedIndex="{Binding SelectedOperationType}" ToolTip.Tip="The type of the operation to add."/>
-          <Button Grid.Column="2" Content=" + " Command="{Binding AddOperation}" ToolTip.Tip="Adds a new operation after the one selected (or at the end)."/>
-          <Button Grid.Column="3" Content=" - " Command="{Binding RemoveOperation}" ToolTip.Tip="Removes the selected operation (or the first one)."/>
-          <ButtonSpinner Grid.Column="4" Spin="MoveOperation" ToolTip.Tip="Moves the selected operation (or the first one)."/>
+        <Grid ColumnDefinitions="*,auto">
+          <ComboBox Grid.Column="0" Items="{Binding OperationTypes}" SelectedIndex="{Binding SelectedOperationType}" ToolTip.Tip="The type of the operation to add."/>
+          <Button Grid.Column="1" Content="Add" Command="{Binding AddOperation}" ToolTip.Tip="Adds a new operation after the one selected (or at the end)."/>
         </Grid>
       </Border>
       
@@ -127,20 +124,47 @@
     <Style Selector="Border.ConnectUp">
       <Setter Property="Margin" Value="4,-5,4,4"/>
     </Style>
+    
+    <!-- Expander Fix -->
+    <Style Selector="Expander /template/ ToggleButton#PART_toggle /template/ Border">
+      <Setter Property="Background" Value="Transparent"/>
+    </Style>
 
-    <!-- Operation Styles -->
-    <Style Selector="Expander.OperationExpander">
-      <Setter Property="Header">
-        <Template>
-          <Grid ColumnDefinitions="auto,*,auto">
-            <CheckBox  Grid.Column="0" Margin="0,0,8,0" IsChecked="{Binding IsEnabled}" Command="{Binding $parent[6].DataContext.Preview}" ToolTip.Tip="Enable/Disable the operation."/>
-            <TextBlock Grid.Column="1" Margin="0,0,8,0" Text="{Binding Name}" ToolTip.Tip="Click here to expand, or further to the side to select this operation."/>
-            <Grid Grid.Column="2" ToolTip.Tip="{Binding Error}" IsVisible="{Binding !!Error.Length}">
+    <!-- List Destyling -->
+    <Style Selector="ListBoxItem:not(:pointerover):selected /template/ ContentPresenter">
+      <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    <Style Selector="ListBoxItem:pointerover:selected /template/ ContentPresenter">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}"/>
+    </Style>
+    
+    <!-- Operation Control (Wrapper) -->
+    <Style Selector="ContentControl.OperationControl">
+      <Setter Property="Template">
+        <ControlTemplate>
+          <Grid ColumnDefinitions="*,auto,auto,auto" RowDefinitions="auto,auto" Name="OperationGrid" Margin="0" Background="Transparent">
+            <Expander Grid.Column="0" Name="OperationExpander" Margin="0">
+              <Expander.Header>
+                <CheckBox Margin="0" Content="{Binding Name}" IsChecked="{Binding IsEnabled}" PropertyChanged="PreviewChanged"/>
+              </Expander.Header>
+            </Expander>
+            <Grid Grid.Column="1" ToolTip.Tip="{Binding Error}" IsVisible="{Binding !!Error.Length}" Background="Transparent">
               <Ellipse   Width="18" Height="18" Margin="0" Stroke="DarkRed" StrokeThickness="2"/>
               <TextBlock Width="18" Height="18" Margin="0" Foreground="DarkRed" Text="!" FontWeight="Black" TextAlignment="Center"/>
             </Grid>
+            <Button Grid.Column="2" Background="Transparent" VerticalAlignment="Center" BorderBrush="Transparent" IsVisible="{Binding $parent.IsPointerOver}" ToolTip.Tip="Click to delete this operation." Padding="0">
+              <Button.Content>
+                <Grid Width="16" Height="16" Background="Transparent" PointerReleased="DeleteOperation">
+                  <Path Data="M0,0 L8,8 M0,8 L8,0" Stroke="Black" StrokeThickness="2" Height="8" HorizontalAlignment="Center"/>
+                </Grid>
+              </Button.Content>
+            </Button>
+            <Grid Grid.Column="3" Background="Transparent" Cursor="SizeAll" IsVisible="{Binding $parent.IsPointerOver}" ToolTip.Tip="Click and drag to move this operation." PointerPressed="StartMoveOperation" PointerReleased="EndMoveOperation">
+              <Path Data="M0,0 L12,0 M0,4 L12,4 M0,8 L12,8" Height="8" VerticalAlignment="Center" Margin="4" Stroke="Black" StrokeThickness="2"/>
+            </Grid>
+            <ContentPresenter Grid.ColumnSpan="4" Grid.Row="1" Content="{TemplateBinding Content}"  IsVisible="{Binding #OperationExpander.IsExpanded}"/>
           </Grid>
-        </Template>
+        </ControlTemplate>
       </Setter>
     </Style>
   </Window.Styles>
@@ -153,17 +177,17 @@
 
     <!-- Operations -->
     <DataTemplate DataType="{x:Type ops:Overwrite}">
-      <Expander Classes="OperationExpander">
+      <ContentControl Classes="OperationControl">
         <Grid ColumnDefinitions="auto,*" RowDefinitions="*,*">
           <TextBlock Grid.Row="0" Text="Replacement:"/>
           <TextBox Grid.Row="0" Text="{Binding Replacement}" PropertyChanged="PreviewChanged" ToolTip.Tip="The text to overwrite the entire file name with."/>
           <TextBlock Grid.Row="1" Text="Full Name:"/>
           <CheckBox Grid.Row="1" IsChecked="{Binding FullName}" PropertyChanged="PreviewChanged" ToolTip.Tip="Whether to overwrite the file extension as well."/>
         </Grid>
-      </Expander>
+      </ContentControl>
     </DataTemplate>
     <DataTemplate DataType="{x:Type ops:Remove}">
-      <Expander Classes="OperationExpander">
+      <ContentControl Classes="OperationControl">
         <Grid ColumnDefinitions="auto,*" RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto,auto,auto,auto">
           <TextBlock Grid.Row="0" Text="Mode:"/>
           <ComboBox Grid.Row="0" Items="{Binding Modes}" Name="ModeSelector" SelectedIndex="{Binding Mode}" PropertyChanged="PreviewChanged" ToolTip.Tip="How to select the parts removed.">
@@ -192,10 +216,10 @@
           <TextBlock Grid.Row="10" Text="Full Name:"/>
           <CheckBox Grid.Row="10" IsChecked="{Binding FullName}" PropertyChanged="PreviewChanged" ToolTip.Tip="Whether to consider the file extension as well."/>
         </Grid>
-      </Expander>
+      </ContentControl>
     </DataTemplate>
     <DataTemplate DataType="{x:Type ops:Replace}">
-      <Expander Classes="OperationExpander">
+      <ContentControl Classes="OperationControl">
         <Grid ColumnDefinitions="auto,*" RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto,auto,auto,auto">
           <TextBlock Grid.Row="0" Text="Mode:"/>
           <ComboBox Grid.Row="0" Items="{Binding Modes}" Name="ModeSelector" SelectedIndex="{Binding Mode}" PropertyChanged="PreviewChanged" ToolTip.Tip="How to select the parts replaced.">
@@ -226,10 +250,10 @@
           <TextBlock Grid.Row="10" Text="Full Name:"/>
           <CheckBox Grid.Row="10" IsChecked="{Binding FullName}" PropertyChanged="PreviewChanged" ToolTip.Tip="Whether to consider the file extension as well."/>
         </Grid>
-      </Expander>
+      </ContentControl>
     </DataTemplate>
     <DataTemplate DataType="{x:Type ops:Number}">
-      <Expander Classes="OperationExpander">
+      <ContentControl Classes="OperationControl">
         <Grid ColumnDefinitions="auto,*" RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto,auto">
           <TextBlock Grid.Row="0" Text="Mode:"/>
           <ComboBox Grid.Row="0" Items="{Binding Modes}" Name="ModeSelector" SelectedIndex="{Binding Mode}" PropertyChanged="PreviewChanged" ToolTip.Tip="Where to insert the numbering.">
@@ -256,10 +280,10 @@
           <TextBlock Grid.Row="8" Text="Full Name:"/>
           <CheckBox Grid.Row="8" IsChecked="{Binding FullName}" PropertyChanged="PreviewChanged" ToolTip.Tip="Whether to consider the file extension as well."/>
         </Grid>
-      </Expander>
+      </ContentControl>
     </DataTemplate>
     <DataTemplate DataType="{x:Type ops:Add}">
-      <Expander Classes="OperationExpander">
+      <ContentControl Classes="OperationControl">
         <Grid ColumnDefinitions="auto,*" RowDefinitions="auto,auto,auto,auto">
           <TextBlock Grid.Row="0" Text="Mode:"/>
           <ComboBox Grid.Row="0" Items="{Binding Modes}" Name="ModeSelector" SelectedIndex="{Binding Mode}" PropertyChanged="PreviewChanged" ToolTip.Tip="Where to add the new text.">
@@ -276,10 +300,10 @@
           <TextBlock Grid.Row="3" Text="Full Name:"/>
           <CheckBox Grid.Row="3" IsChecked="{Binding FullName}" PropertyChanged="PreviewChanged" ToolTip.Tip="Whether to consider the file extension as well."/>
         </Grid>
-      </Expander>
+      </ContentControl>
     </DataTemplate>
     <DataTemplate DataType="{x:Type ops:Sort}">
-      <Expander Classes="OperationExpander">
+      <ContentControl Classes="OperationControl">
         <Grid ColumnDefinitions="auto,*" RowDefinitions="auto,auto,auto">
           <TextBlock Grid.Row="0" Text="Mode:"/>
           <ComboBox Grid.Row="0" Items="{Binding Modes}" Name="ModeSelector" SelectedIndex="{Binding Mode}" PropertyChanged="PreviewChanged" ToolTip.Tip="The method that is used to compare and sort the file names.">
@@ -294,7 +318,7 @@
           <TextBlock Grid.Row="2" Text="Full Name:" IsVisible="{Binding !#ModeSelector.SelectedItem.IsReverse}"/>
           <CheckBox Grid.Row="2" IsChecked="{Binding FullName}" IsVisible="{Binding !#ModeSelector.SelectedItem.IsReverse}" PropertyChanged="PreviewChanged" ToolTip.Tip="Whether to consider the file extension as well."/>
         </Grid>
-      </Expander>
+      </ContentControl>
     </DataTemplate>
   </Window.DataTemplates>
 </Window>
diff --git a/BFR/MainWindow.xaml.cs b/BFR/MainWindow.xaml.cs
index 05f5ee3..94a03c9 100644
--- a/BFR/MainWindow.xaml.cs
+++ b/BFR/MainWindow.xaml.cs
@@ -11,6 +11,10 @@ using Avalonia.Markup.Xaml;
 
 using BFR.Helpers;
 using BFR.DataModels;
+using Avalonia.Interactivity;
+using Avalonia.Input;
+using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
 
 namespace BFR
 {
@@ -80,23 +84,30 @@ namespace BFR
             Preview();
         }
 
-        public void RemoveOperation()
+        private ListBox OperationsListBox;
+        private ListBoxItem DragItem;
+
+        public void DeleteOperation(object sender, PointerReleasedEventArgs e)
         {
-            if (SelectedOperation >= 0)
-                Operations.RemoveAt(SelectedOperation);
-            else Operations.RemoveAt(0);
+            var hoveredItem = (ListBoxItem)OperationsListBox.GetLogicalChildren().FirstOrDefault(x => this.GetVisualsAt(e.GetPosition(this)).Contains(((IVisual)x).GetVisualChildren().First()));
+            if(hoveredItem != null) Operations.RemoveAt(OperationsListBox.GetLogicalChildren().ToList().IndexOf(hoveredItem));
             Preview();
         }
 
-        public void MoveOperation(object sender, SpinEventArgs e)
+        public void StartMoveOperation(object sender, PointerPressedEventArgs e) =>
+            DragItem = OperationsListBox.GetLogicalChildren().Cast<ListBoxItem>().Single(x => x.IsPointerOver);
+
+        public void EndMoveOperation(object sender, PointerReleasedEventArgs e)
         {
-            HandleEvents = false;
-            if (Operations.Count > 1)
-                if (e.Direction == SpinDirection.Increase && SelectedOperation > 0)
-                    Operations.Move(SelectedOperation, SelectedOperation - 1);
-                else if (e.Direction == SpinDirection.Decrease && SelectedOperation < Operations.Count - 1)
-                    Operations.Move(SelectedOperation, SelectedOperation + 1);
-            HandleEvents = true;
+            var hoveredItem = (ListBoxItem)OperationsListBox.GetLogicalChildren().FirstOrDefault(x => this.GetVisualsAt(e.GetPosition(this)).Contains(((IVisual)x).GetVisualChildren().First()));
+            if (DragItem == null ||
+                hoveredItem == null ||
+                DragItem == hoveredItem)
+                return;
+            Operations.Move(
+                OperationsListBox.GetLogicalChildren().ToList().IndexOf(DragItem),
+                OperationsListBox.GetLogicalChildren().ToList().IndexOf(hoveredItem));
+            DragItem = null;
             Preview();
         }
 
@@ -128,6 +139,7 @@ namespace BFR
             DataContext = this;
             OpenDirectory(Environment.OSVersion.Platform == PlatformID.Win32NT ? @"C:\Users" : @"\home");
             HandleEvents = true;
+            OperationsListBox = this.Find<ListBox>("OperationsListBox");
         }
     }
 }
\ No newline at end of file