diff --git a/src/App.xaml b/src/App.xaml
index fcf5806..416604b 100644
--- a/src/App.xaml
+++ b/src/App.xaml
@@ -3,7 +3,8 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:tb="http://www.hardcodet.net/taskbar"
              xmlns:controls="clr-namespace:SierraHOTAS.Controls"
-             xmlns:dataTemplates="clr-namespace:SierraHOTAS.ViewModels.DataTemplates">
+             xmlns:dataTemplates="clr-namespace:SierraHOTAS.ViewModels.DataTemplates"
+             xmlns:models="clr-namespace:SierraHOTAS.Models">
 
     <Application.Resources>
 
@@ -35,6 +36,8 @@
         <controls:AxisValueToPercentageConverter x:Key="AxisValueToPercentageConverter"/>
         <controls:FileNameConverter x:Key="FileNameConverter"/>
         <controls:NullToVisibilityConverter x:Key="NullToVisibilityConverter"/>
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+
 
         <BooleanToVisibilityConverter x:Key="VisibleIfTrueConverter" />
 
@@ -208,14 +211,14 @@
                     <Setter Property="Background" Value="{StaticResource HoverBrush}"/>
                 </Trigger>
 
-                 <!-- highlighting the selected row -->
+                <!-- highlighting the selected row -->
                 <Trigger Property="IsSelected" Value="True">
                     <Setter Property="BorderThickness" Value="1"/>
                     <Setter Property="BorderBrush" Value="{StaticResource SelectedBorderBrush}"/>
                     <Setter Property="Background" Value="{StaticResource SelectedBrush}"/>
                 </Trigger>
 
-                 <!-- if a device becomes unconnected, then grey out the item -->
+                <!-- if a device becomes unconnected, then grey out the item -->
                 <DataTrigger Binding="{Binding IsDeviceLoaded}" Value="false">
                     <Setter Property="Foreground" Value="{StaticResource DisabledForegroundBrush}"/>
                 </DataTrigger>
@@ -225,8 +228,8 @@
 
             </Style.Triggers>
 
-            
-            
+
+
             <!-- highlight color (needs mouseover trigger)-->
             <Setter Property="Template">
                 <Setter.Value>
@@ -241,7 +244,7 @@
             </Setter>
 
         </Style>
-        
+
         <!-- device list view column header style -->
         <Style x:Key="DeviceListViewGridViewStyle" TargetType="{x:Type GridViewColumnHeader}">
             <Setter Property="Height" Value="24"/>
@@ -445,11 +448,40 @@
         </ControlTemplate>
 
         <Style x:Key="{x:Type ComboBox}" TargetType="ComboBox">
+            <Setter Property="ItemTemplate">
+                <Setter.Value>
+                    <DataTemplate DataType="{x:Type models:ActionCatalogItem}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock 
+                                Text="{Binding ActionName}"
+                                HorizontalAlignment="Left" 
+                                VerticalAlignment="Center" 
+                                Focusable="True" 
+                                Background="Transparent"
+                                Foreground="{StaticResource TextBrush}"
+                                Width="300"
+                                />
+                            <Button Command="{Binding RemoveActionCatalogItemCommand}"
+                                    CommandParameter="{Binding}"
+                                    Visibility="{Binding IsRemovable, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                    ToolTip="Remove Action" 
+                                    ToolTipService.InitialShowDelay="800" 
+                                    HorizontalContentAlignment="Right"
+                                    HorizontalAlignment="Right"
+                                    Background="Transparent" 
+                                    BorderBrush="Transparent">
+                                <Image Source="../Images/remove_red_26x26.png" Height="12" Width="12"/>
+                            </Button>
+                        </StackPanel>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
             <Setter Property="Foreground" Value="{StaticResource TextBrush}"/>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ComboBox">
                         <Grid>
+                            <CheckBox></CheckBox>
                             <ToggleButton 
                                  Name="ToggleButton" 
                                  Template="{StaticResource ComboBoxToggleButton}" 
@@ -563,7 +595,7 @@
             <Setter Property="Foreground" Value="{StaticResource TextHeaderBrush}"/>
             <Setter Property="Margin" Value="2"/>
         </Style>
-        
+
         <Style x:Key="DataGridCellStyle" TargetType="{x:Type DataGridCell}">
             <Style.Triggers>
                 <Trigger Property="IsSelected" Value="True">
@@ -573,7 +605,7 @@
                 </Trigger>
             </Style.Triggers>
         </Style>
-        
+
         <Style x:Key="DataGridRowStyle" TargetType="{x:Type DataGridRow}">
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="Foreground" Value="{StaticResource TextBrush}"/>
diff --git a/src/Models/ActionCatalog.cs b/src/Models/ActionCatalog.cs
index 2f640f6..0e253a9 100644
--- a/src/Models/ActionCatalog.cs
+++ b/src/Models/ActionCatalog.cs
@@ -21,6 +21,14 @@ public ActionCatalog()
             Catalog.CollectionChanged += Catalog_CollectionChanged;
         }
 
+        public void PostDeserializeProcess()
+        {
+            foreach (var item in Catalog)
+            {
+                item.RemoveRequested += RemoveRequested_Handler;
+            }
+        }
+
         private void Catalog_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             if (e.OldItems != null)
@@ -38,6 +46,8 @@ private void Catalog_CollectionChanged(object sender, NotifyCollectionChangedEve
                     item.PropertyChanged += Item_PropertyChanged;
                 }
             }
+
+            CollectionChanged?.Invoke(sender, e);
         }
 
         private void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -45,6 +55,7 @@ private void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
             if (sender is ActionCatalogItem item)
             {
                 ReSortItem(item);
+                //Catalog = Catalog.OrderBy(x => x.ActionName).ToObservableCollection();
             }
         }
 
@@ -66,11 +77,6 @@ private int GetSortPosition(ActionCatalogItem item)
             return i;
         }
 
-        //public void Sort()
-        //{
-        //    Catalog = Catalog.OrderBy(x => x.ActionName).ToObservableCollection();
-        //}
-
         public void Clear()
         {
             Catalog.Clear();
@@ -95,8 +101,10 @@ public void Add(ActionCatalogItem item)
             {
                 var i = Catalog.First(x => x.ActionName == item.ActionName);
                 Catalog.Remove(i);
+                i.RemoveRequested -= RemoveRequested_Handler;
             }
 
+            item.RemoveRequested += RemoveRequested_Handler;
             Catalog.Add(item);
         }
 
@@ -108,13 +116,26 @@ public void Add(ActionCatalogItem item, string buttonName)
             {
                 item.ActionName = $"Action for {buttonName}";
             }
+
+            item.RemoveRequested += RemoveRequested_Handler;
             Insert(item);
         }
 
+        private void RemoveRequested_Handler(object sender, ActionCatalogItemRemovedRequestedEventArgs e)
+        {
+            if (Catalog.Contains(e.ActionCatalogItem))
+            {
+                if (e.ActionCatalogItem.NoAction) return;
+                Catalog.Remove(e.ActionCatalogItem);
+            }
+            e.ActionCatalogItem.RemoveRequested -= RemoveRequested_Handler;
+        }
+
         private void Insert(ActionCatalogItem item)
         {
             var index = GetSortPosition(item);
             Catalog.Insert(index, item);
+            item.RemoveRequested += RemoveRequested_Handler;
             Logging.Log.Debug($"[{item.ActionName}] added to actions catalog at position: {index}");
         }
 
diff --git a/src/Models/ActionCatalogItem.cs b/src/Models/ActionCatalogItem.cs
index c8dbf99..4a6aaea 100644
--- a/src/Models/ActionCatalogItem.cs
+++ b/src/Models/ActionCatalogItem.cs
@@ -3,17 +3,25 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
+using SierraHOTAS.ViewModels.Commands;
+using System.Windows.Input;
+using SierraJSON;
 
 namespace SierraHOTAS.Models
 {
     public class ActionCatalogItem : INotifyPropertyChanged, IComparable<ActionCatalogItem>
     {
+        public event EventHandler<ActionCatalogItemRemovedRequestedEventArgs> RemoveRequested;
+
         private string _actionName;
         public const string NO_ACTION_TEXT = "<No Action>";
 
         public Guid Id { get; set; }
 
+        [SierraJsonIgnore] 
         public bool NoAction { get; set; } = false;
+
+        [SierraJsonIgnore] public bool IsRemovable => !NoAction;
         
         [DefaultValue("")]
         public string ActionName
@@ -34,16 +42,20 @@ public string ActionName
         public int CompareTo(ActionCatalogItem other)
         {
             if (other == null) return 1;
-            var value = string.CompareOrdinal(other.ActionName, ActionName) * -1;
+            var value = string.Compare(other.ActionName, ActionName, comparisonType: StringComparison.OrdinalIgnoreCase) * -1;
             Logging.Log.Info($"Comparing:'{other.ActionName}' to '{ActionName}': {value}");
             return value;
         }
 
         public override string ToString()
         {
-            return $"{ActionName} - {Actions.Count}";
+            return $"{ActionName} ({Actions.Count} button actions)";
         }
 
+        private ICommand _removeActionCatalogItemCommand;
+
+        public ICommand RemoveActionCatalogItemCommand => _removeActionCatalogItemCommand ?? (_removeActionCatalogItemCommand = new CommandHandlerWithParameter<ActionCatalogItem>(RemoveActionCatalogItem));
+
         public ActionCatalogItem()
         {
             ActionName = "";
@@ -51,6 +63,11 @@ public ActionCatalogItem()
             Id = Guid.NewGuid();
         }
 
+        private void RemoveActionCatalogItem(ActionCatalogItem item)
+        {
+            RemoveRequested?.Invoke(this, new ActionCatalogItemRemovedRequestedEventArgs(item));
+        }
+
         public static ActionCatalogItem EmptyItem()
         {
             return new ActionCatalogItem {Id = Guid.Empty, NoAction = true, ActionName = NO_ACTION_TEXT, Actions = new ObservableCollection<ButtonAction>() };
diff --git a/src/Models/ActionCatalogItemRemovedRequestedEventArgs.cs b/src/Models/ActionCatalogItemRemovedRequestedEventArgs.cs
new file mode 100644
index 0000000..6678c77
--- /dev/null
+++ b/src/Models/ActionCatalogItemRemovedRequestedEventArgs.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace SierraHOTAS.Models
+{
+    public class ActionCatalogItemRemovedRequestedEventArgs : EventArgs
+    {
+        public ActionCatalogItem ActionCatalogItem { get; set; }
+        public ActionCatalogItemRemovedRequestedEventArgs(ActionCatalogItem item)
+        {
+            ActionCatalogItem = item;
+        }
+    }
+}
diff --git a/src/Models/FileSystem.cs b/src/Models/FileSystem.cs
index 551e82a..7515144 100644
--- a/src/Models/FileSystem.cs
+++ b/src/Models/FileSystem.cs
@@ -145,6 +145,7 @@ public IHOTASCollection FileOpen(string path)
                 if (version == HOTASCollection.FileFormatVersion)
                 {
                     collection = Serializer.ToObject<HOTASCollection>(json, new CustomSierraJsonConverter());
+                    collection.ActionCatalog.PostDeserializeProcess();
                 }
                 //else - based on version, use factory to get old version and convert/map to latest version, then re-save
                 else
diff --git a/src/Models/HOTASAxis.cs b/src/Models/HOTASAxis.cs
index b0e9f3d..07266e8 100644
--- a/src/Models/HOTASAxis.cs
+++ b/src/Models/HOTASAxis.cs
@@ -1,8 +1,8 @@
 using SierraHOTAS.ViewModels;
+using SierraJSON;
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
-using SierraJSON;
 
 namespace SierraHOTAS.Models
 {
@@ -42,6 +42,51 @@ public HOTASAxis()
             _previousValues = new int[_arraySize];
         }
 
+        /// <summary>
+        /// All properties are copied except for ActionCatalogItem because ActionCatalogItem is a reference to an entry in a global dictionary that we don't want to duplicate
+        /// New Segment property changed handlers are added, not re-referenced.
+        /// </summary>
+        /// <returns></returns>
+        public IHotasBaseMap Clone()
+        {
+            var cloneButtonMap = new ObservableCollection<HOTASButton>();
+            foreach (var b in ButtonMap)
+            {
+                cloneButtonMap.Add((HOTASButton)b.Clone());
+            }
+
+            var cloneReverseButtonMap = new ObservableCollection<HOTASButton>();
+            foreach (var b in ReverseButtonMap)
+            {
+                cloneButtonMap.Add((HOTASButton)b.Clone());
+            }
+
+            var cloneSegments = new ObservableCollection<Segment>();
+            foreach (var s in Segments)
+            {
+                cloneSegments.Add(s.Clone());
+            }
+
+            var clone = new HOTASAxis()
+            {
+                MapId = MapId,
+                MapName = MapName,
+                Type = Type,
+                ButtonMap = cloneButtonMap,
+                ReverseButtonMap = cloneReverseButtonMap,
+                IsDirectional = IsDirectional,
+                IsMultiAction = IsMultiAction,
+                SoundFileName = SoundFileName,
+                SoundVolume = SoundVolume,
+                Segments = cloneSegments,
+                Direction = Direction
+            };
+
+            clone.AddSegmentBoundaryHandlers();
+
+            return clone;
+        }
+
         public void SetAxis(int value)
         {
             SetDirection(value);
@@ -115,7 +160,7 @@ public void CreateActionMapList()
             }
         }
 
-        private void AddSegmentBoundaryHandlers()
+        public void AddSegmentBoundaryHandlers()
         {
             foreach (var item in Segments)
             {
diff --git a/src/Models/HOTASButton.cs b/src/Models/HOTASButton.cs
index f24e810..5fc0b51 100644
--- a/src/Models/HOTASButton.cs
+++ b/src/Models/HOTASButton.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Collections.ObjectModel;
+using SierraJSON;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using SierraJSON;
 
 namespace SierraHOTAS.Models
 {
@@ -43,13 +43,33 @@ public string ActionName
         public bool IsMacro => ActionCatalogItem.Actions.Any(a => a.TimeInMilliseconds > 0);
 
         private bool _isRecording;
-        private ObservableCollection<ButtonAction> _actionsHistory;
+        private List<ButtonAction> _actionsHistory;
 
         public HOTASButton()
         {
             ActionCatalogItem = new ActionCatalogItem();
         }
 
+        /// <summary>
+        /// All properties are copied except for ActionCatalogItem because ActionCatalogItem is a reference to an entry in a global dictionary that we don't want to duplicate
+        /// </summary>
+        /// <returns></returns>
+        public IHotasBaseMap Clone()
+        {
+            var clone = new HOTASButton()
+            {
+                MapId = MapId,
+                MapName = MapName,
+                Type = Type,
+                ShiftModePage = ShiftModePage,
+                IsShift = IsShift,
+                IsOneShot = IsOneShot,
+                RepeatCount = RepeatCount,
+                ActionCatalogItem = ActionCatalogItem //copy reference, DO NOT want a deep clone
+            };
+            return clone;
+        }
+
         private void SetRecordState(bool isRecording)
         {
             _isRecording = isRecording;
@@ -66,7 +86,7 @@ private void SetRecordState(bool isRecording)
 
         public void Record()
         {
-            _actionsHistory = ActionCatalogItem.Actions.ToList().ToObservableCollection();//make an actual copy
+            _actionsHistory = ActionCatalogItem.Actions.ToList();
             ActionCatalogItem.Actions.Clear();
             SetRecordState(true);
         }
diff --git a/src/Models/HOTASCollection.cs b/src/Models/HOTASCollection.cs
index 631c571..fee4732 100644
--- a/src/Models/HOTASCollection.cs
+++ b/src/Models/HOTASCollection.cs
@@ -1,11 +1,13 @@
 using SharpDX.DirectInput;
+using SierraHOTAS.Factories;
+using SierraJSON;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using SierraHOTAS.Factories;
-using SierraJSON;
 
 namespace SierraHOTAS.Models
 {
@@ -99,7 +101,7 @@ public void ReplaceDevice(IHOTASDevice newDevice)
 
         private void RebuildMapForNewDevice(IHOTASDevice device, IHOTASDevice newDevice)
         {
-            newDevice.ApplyButtonMap(device.ButtonMap.ToObservableCollection());
+            newDevice.ApplyButtonMap(device.CloneButtonMap());
             newDevice.SetMode(device.Modes);
             newDevice.SetModeActivation(ModeActivationButtons);
         }
@@ -137,7 +139,7 @@ public void ResetProfile()
             {
                 d.Reset();
             }
-            
+
             Mode = 1;
             ActionCatalog.Clear();
             ModeActivationButtons.Clear();
@@ -174,7 +176,7 @@ public void ListenToDevice(IHOTASDevice device)
             device.ModeSelected += device_modeSelected;
             device.ShiftReleased += Device_ShiftReleased;
             device.LostConnectionToDevice += Device_LostConnectionToDevice;
-            
+
             device.SetModeActivation(ModeActivationButtons);
             device.ListenAsync();
         }
@@ -391,10 +393,10 @@ public bool RemoveMode(ModeActivationItem item)
                 foreach (var d in Devices)
                 {
                     d.RemoveMode(item.Mode);
-                } 
+                }
 
                 Logging.Log.Debug($"DELETED Mode {item.Mode}!");
-                
+
                 if (ModeActivationButtons.Count <= 0) return true;
 
                 var firstMode = ModeActivationButtons.Keys.FirstOrDefault();
diff --git a/src/Models/HOTASDevice.cs b/src/Models/HOTASDevice.cs
index ddcdba3..a52011d 100644
--- a/src/Models/HOTASDevice.cs
+++ b/src/Models/HOTASDevice.cs
@@ -374,6 +374,16 @@ public void SetModeActivation(Dictionary<int, ModeActivationItem> modeActivation
             _modeActivationButtons = modeActivationButtons;
         }
 
+        public ObservableCollection<IHotasBaseMap> CloneButtonMap()
+        {
+            var clone = new ObservableCollection<IHotasBaseMap>();
+            foreach (var b in ButtonMap)
+            {
+                clone.Add(b.Clone());
+            }
+            return clone;
+        }
+
         public void ForceButtonPress(JoystickOffset offset, bool isDown)
         {
             _hotasQueue.ForceButtonPress(offset, isDown);
diff --git a/src/Models/IHOTASDevice.cs b/src/Models/IHOTASDevice.cs
index 9886965..1f22a7f 100644
--- a/src/Models/IHOTASDevice.cs
+++ b/src/Models/IHOTASDevice.cs
@@ -44,5 +44,6 @@ public interface IHOTASDevice
         void Reset();
         bool GetButtonState(int mapId);
         void SetModeActivation(Dictionary<int, ModeActivationItem> modeActivationButtons);
+        ObservableCollection<IHotasBaseMap> CloneButtonMap();
     }
 }
diff --git a/src/Models/IHotasBaseMap.cs b/src/Models/IHotasBaseMap.cs
index af15959..e48440f 100644
--- a/src/Models/IHotasBaseMap.cs
+++ b/src/Models/IHotasBaseMap.cs
@@ -8,5 +8,6 @@ public interface IHotasBaseMap
         void ClearUnassignedActions();
         void CalculateSegmentRange(int segments);
         void ClearSegments();
+        IHotasBaseMap Clone();
     }
 }
diff --git a/src/Models/Segment.cs b/src/Models/Segment.cs
index 47d0975..b0046a3 100644
--- a/src/Models/Segment.cs
+++ b/src/Models/Segment.cs
@@ -33,5 +33,10 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
+
+        public Segment Clone()
+        {
+            return new Segment(Id, Value);
+        }
     }
 }
diff --git a/src/SierraHOTAS.csproj b/src/SierraHOTAS.csproj
index 247dbab..2bde5c7 100644
--- a/src/SierraHOTAS.csproj
+++ b/src/SierraHOTAS.csproj
@@ -102,6 +102,7 @@
     <Compile Include="Factories\MediaPlayerFactory.cs" />
     <Compile Include="IEventAggregator.cs" />
     <Compile Include="IoCContainer.cs" />
+    <Compile Include="Models\ActionCatalogItemRemovedRequestedEventArgs.cs" />
     <Compile Include="Models\ActionJobItem.cs" />
     <Compile Include="Models\DirectInputWrapper.cs" />
     <Compile Include="Factories\DispatcherFactory.cs" />
diff --git a/src/ViewModels/ButtonMapViewModel.cs b/src/ViewModels/ButtonMapViewModel.cs
index c8fdf59..22bfe60 100644
--- a/src/ViewModels/ButtonMapViewModel.cs
+++ b/src/ViewModels/ButtonMapViewModel.cs
@@ -15,7 +15,7 @@ public class ButtonMapViewModel : IBaseMapViewModel, INotifyPropertyChanged
 
         public ActionCatalogItem ActionItem
         {
-            get => _hotasButton.ActionCatalogItem; 
+            get => _hotasButton.ActionCatalogItem;
             set => _hotasButton.ActionCatalogItem = value;
         }
 
diff --git a/src/ViewModels/HOTASCollectionViewModel.cs b/src/ViewModels/HOTASCollectionViewModel.cs
index 5868d5e..2a4e270 100644
--- a/src/ViewModels/HOTASCollectionViewModel.cs
+++ b/src/ViewModels/HOTASCollectionViewModel.cs
@@ -1,9 +1,11 @@
 using SierraHOTAS.Annotations;
+using SierraHOTAS.Controls;
 using SierraHOTAS.Factories;
 using SierraHOTAS.Models;
 using SierraHOTAS.ViewModels.Commands;
 using System;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
@@ -112,7 +114,7 @@ public string ProfileSetFileName
         private ICommand _toggleModeOverlayCommand;
 
         public ICommand ToggleModeOverlayCommand => _toggleModeOverlayCommand ?? (_toggleModeOverlayCommand = new CommandHandler(ToggleModeOverlay));
-        
+
         private ICommand _showAboutWindowCommand;
 
         public ICommand ShowAboutWindowCommand => _showAboutWindowCommand ?? (_showAboutWindowCommand = new CommandHandler(ShowAboutWindow));
@@ -293,6 +295,8 @@ public void Initialize()
 
             _deviceList.Start();
 
+            ActionCatalog.CollectionChanged += ActionCatalog_CollectionChanged;
+
             BuildDevicesViewModel();
             AddHandlers();//TODO remove? addhandlers gets called in LoadHotas
 
@@ -446,7 +450,9 @@ private void BuildDevicesViewModelFromLoadedDevices(IHOTASCollection loadedDevic
         private void BuildDevicesViewModel()
         {
             RemoveAllHandlers();
-            Devices = _deviceList.Devices.Select(device => _deviceViewModelFactory.CreateDeviceViewModel(_appDispatcher, _fileSystem, _mediaPlayerFactory, device)).ToObservableCollection();
+            Devices = _deviceList.Devices.Select(device =>
+                _deviceViewModelFactory.CreateDeviceViewModel(_appDispatcher, _fileSystem, _mediaPlayerFactory,
+                    device)).ToObservableCollection();
         }
 
         private void DeviceList_ButtonPressed(object sender, ButtonPressedEventArgs e)
@@ -556,7 +562,7 @@ private void FileOpenDialog()
             var loadedDeviceList = _fileSystem.FileOpenDialog();
             if (loadedDeviceList == null)
             {
-                ProfileSetFileName = _fileSystem.LastSavedFileName; 
+                ProfileSetFileName = _fileSystem.LastSavedFileName;
                 return;
             }
             LoadHotas(loadedDeviceList);
@@ -568,7 +574,7 @@ private void LoadHotas(IHOTASCollection loadedDeviceList)
 
             RemoveUnconnectedDevices();
 
-            _deviceList.SetCatalog(loadedDeviceList.ActionCatalog);
+            SetCatalog(loadedDeviceList.ActionCatalog);
 
             BuildDevicesViewModelFromLoadedDevices(loadedDeviceList);
             BuildModeActivationListFromLoadedDevices(loadedDeviceList);
@@ -580,7 +586,7 @@ private void LoadHotas(IHOTASCollection loadedDeviceList)
             _deviceList.AutoSetMode();
             _deviceList.ListenToAllDevices();
 
-            FileOpened?.Invoke(this, new EventArgs());
+            FileOpened?.Invoke(this, EventArgs.Empty);
 
             Logging.Log.Info($"Loaded a device set...");
             foreach (var d in Devices)
@@ -589,6 +595,124 @@ private void LoadHotas(IHOTASCollection loadedDeviceList)
             }
         }
 
+        public void SetCatalog(ActionCatalog catalog)
+        {
+            if (ActionCatalog != null)
+            {
+                ActionCatalog.CollectionChanged -= ActionCatalog_CollectionChanged;
+            }
+
+            _deviceList.SetCatalog(catalog);
+            if (ActionCatalog == null) return;
+
+            ActionCatalog.CollectionChanged += ActionCatalog_CollectionChanged;
+        }
+
+        #region ActionCatalog Management
+        //
+        // When a CatalogActionItem is removed in the UI, clean up all the ButtonMap view models and all the the Mode models
+        // This ensures that the item that is removed is removed from the UI in all locations
+        //
+        private void ActionCatalog_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action != NotifyCollectionChangedAction.Remove) return;
+            if (e.OldItems == null || e.OldItems.Count != 1) return;
+            var removedItem = e.OldItems[0] as ActionCatalogItem;
+
+            RemoveActionCatalogItemFromButtonMap(removedItem);
+            RemoveActionCatalogItemFromAllModes(removedItem);
+        }
+
+        private void RemoveActionCatalogItemFromAllModes(ActionCatalogItem removedItem)
+        {
+            foreach (var d in Devices)
+            {
+                foreach (var mode in d.Modes)
+                {
+                    var mapList = mode.Value;
+
+                    foreach (var map in mapList)
+                    {
+                        switch (map.Type)
+                        {
+                            case HOTASButton.ButtonType.AxisLinear:
+                            case HOTASButton.ButtonType.AxisRadial:
+                                var axisMap = map as HOTASAxis;
+                                foreach (var forwardMap in axisMap.ButtonMap)
+                                {
+                                    AssignEmptyIfMatch(forwardMap, removedItem);
+                                }
+
+                                foreach (var reverseMap in axisMap.ReverseButtonMap)
+                                {
+                                    AssignEmptyIfMatch(reverseMap, removedItem);
+                                }
+                                break;
+                            case HOTASButton.ButtonType.POV:
+                            case HOTASButton.ButtonType.Button:
+                                AssignEmptyIfMatch(map as HOTASButton, removedItem);
+                                break;
+                            default:
+                                throw new ArgumentOutOfRangeException();
+                        }
+                    }
+                }
+            }
+        }
+
+        private void RemoveActionCatalogItemFromButtonMap(ActionCatalogItem removedItem)
+        {
+            if (removedItem == null) return;
+
+            foreach (var d in Devices)
+            {
+                foreach (var m in d.ButtonMap)
+                {
+                    switch (m.Type)
+                    {
+                        case HOTASButton.ButtonType.AxisLinear:
+                        case HOTASButton.ButtonType.AxisRadial:
+                            var axisMap = m as AxisMapViewModel;
+                            foreach (var forwardMap in axisMap.ButtonMap)
+                            {
+                                AssignEmptyIfMatch(forwardMap, removedItem);
+                            }
+
+                            foreach (var reverseMap in axisMap.ReverseButtonMap)
+                            {
+                                AssignEmptyIfMatch(reverseMap, removedItem);
+                            }
+                            break; 
+                        case HOTASButton.ButtonType.POV:
+                        case HOTASButton.ButtonType.Button:
+
+                            var buttonMap = m as ButtonMapViewModel;
+                            AssignEmptyIfMatch(buttonMap, removedItem);
+                            break;
+                        default:
+                            throw new ArgumentOutOfRangeException();
+                    }
+                }
+            }
+        }
+
+        private static void AssignEmptyIfMatch(ButtonMapViewModel buttonMap, ActionCatalogItem removedItem)
+        {
+            if (buttonMap?.ActionItem.Id == removedItem.Id)
+            {
+                buttonMap.AssignActions(ActionCatalogItem.EmptyItem());
+            }
+        }
+
+        private static void AssignEmptyIfMatch(HOTASButton buttonMap, ActionCatalogItem removedItem)
+        {
+            if (buttonMap?.ActionId == removedItem.Id)
+            {
+                buttonMap.ActionCatalogItem = ActionCatalogItem.EmptyItem();
+            }
+        }
+        #endregion
+
         private void RemoveUnconnectedDevices()
         {
             //remove devices from the profile that are not actually connected at the moment. since these may only exist for that profile, when loading a new profile we don't want to show them
diff --git a/tests/HOTASCollectionViewModelTests.cs b/tests/HOTASCollectionViewModelTests.cs
index 786577a..a883f4f 100644
--- a/tests/HOTASCollectionViewModelTests.cs
+++ b/tests/HOTASCollectionViewModelTests.cs
@@ -71,7 +71,7 @@ private static HOTASCollectionViewModel CreateHotasCollectionViewModel_WithEvent
 
             var subModeButtons = new Dictionary<int, ModeActivationItem>();
             subHotasCollection.ModeActivationButtons.Returns(subModeButtons);
-
+            subHotasCollection.ActionCatalog.Returns(Substitute.For<ActionCatalog>());
 
             eventAggregator = new EventAggregator();