diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 3c88f1a4a..5f0aea86c 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -568,6 +568,7 @@
     <Compile Include="Profiles\Lua\Modules\Events\LuaKeyPressEventArgs.cs" />
     <Compile Include="Profiles\Lua\Modules\Events\LuaDeviceDrawingEventArgs.cs" />
     <Compile Include="Profiles\Lua\Modules\Events\LuaDeviceUpdatingEventArgs.cs" />
+    <Compile Include="Profiles\Lua\Modules\Gui\EditorButton.cs" />
     <Compile Include="Profiles\Lua\Modules\Gui\LuaButton.cs" />
     <Compile Include="Profiles\Lua\Modules\Gui\LuaCheckBox.cs" />
     <Compile Include="Profiles\Lua\Modules\Gui\LuaComboBox.cs" />
diff --git a/Artemis/Artemis/Managers/LuaManager.cs b/Artemis/Artemis/Managers/LuaManager.cs
index f5df058a7..a01b6b2cd 100644
--- a/Artemis/Artemis/Managers/LuaManager.cs
+++ b/Artemis/Artemis/Managers/LuaManager.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using Artemis.DeviceProviders;
 using Artemis.Profiles;
 using Artemis.Profiles.Lua;
 using Artemis.Profiles.Lua.Modules;
+using Artemis.Profiles.Lua.Modules.Gui;
 using Castle.Core.Internal;
 using MoonSharp.Interpreter;
 using Ninject;
@@ -24,6 +26,8 @@ namespace Artemis.Managers
             _kernel = kernel;
             _logger = logger;
             _deviceManager = deviceManager;
+
+            EditorButtons = new ObservableCollection<EditorButton>();
             LuaScript = new Script(CoreModules.Preset_SoftSandbox);
         }
 
@@ -32,6 +36,7 @@ namespace Artemis.Managers
         public LuaProfileModule ProfileModule { get; private set; }
         public LuaEventsModule EventsModule { get; private set; }
         public Script LuaScript { get; }
+        public ObservableCollection<EditorButton> EditorButtons { get; set; }
 
         public void SetupLua(ProfileModel profileModel)
         {
diff --git a/Artemis/Artemis/Models/ProfileEditorModel.cs b/Artemis/Artemis/Models/ProfileEditorModel.cs
index 093393770..389d5ecf7 100644
--- a/Artemis/Artemis/Models/ProfileEditorModel.cs
+++ b/Artemis/Artemis/Models/ProfileEditorModel.cs
@@ -27,8 +27,7 @@ namespace Artemis.Models
         private FileSystemWatcher _watcher;
         private ModuleModel _luaModule;
 
-        public ProfileEditorModel(WindowService windowService, MetroDialogService dialogService,
-            DeviceManager deviceManager, LuaManager luaManager)
+        public ProfileEditorModel(WindowService windowService, MetroDialogService dialogService, DeviceManager deviceManager, LuaManager luaManager)
         {
             _windowService = windowService;
             _dialogService = dialogService;
@@ -345,7 +344,8 @@ namespace Artemis.Models
 
         private void DisposeLuaWatcher()
         {
-            if (_watcher == null) return;
+            if (_watcher == null)
+                return;
             _watcher.Changed -= LuaFileChanged;
             _watcher.Dispose();
             _watcher = null;
@@ -360,8 +360,6 @@ namespace Artemis.Models
 
         #region Rendering
 
-        
-
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/Artemis/Artemis/Modules/General/GeneralProfile/GeneralProfileView.xaml b/Artemis/Artemis/Modules/General/GeneralProfile/GeneralProfileView.xaml
index ba95e4a36..a512a3593 100644
--- a/Artemis/Artemis/Modules/General/GeneralProfile/GeneralProfileView.xaml
+++ b/Artemis/Artemis/Modules/General/GeneralProfile/GeneralProfileView.xaml
@@ -1,12 +1,6 @@
-<UserControl x:Class="Artemis.Modules.General.GeneralProfile.GeneralProfileView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:cal="http://www.caliburnproject.org"
-    xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-    mc:Ignorable="d"
-    d:DesignHeight="476.986" d:DesignWidth="538.772">
+<UserControl x:Class="Artemis.Modules.General.GeneralProfile.GeneralProfileView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:cal="http://www.caliburnproject.org" xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" mc:Ignorable="d" d:DesignHeight="476.986" d:DesignWidth="538.772">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
diff --git a/Artemis/Artemis/Profiles/Lua/Modules/Gui/EditorButton.cs b/Artemis/Artemis/Profiles/Lua/Modules/Gui/EditorButton.cs
new file mode 100644
index 000000000..7fe85734b
--- /dev/null
+++ b/Artemis/Artemis/Profiles/Lua/Modules/Gui/EditorButton.cs
@@ -0,0 +1,25 @@
+using Artemis.Managers;
+using MoonSharp.Interpreter;
+
+namespace Artemis.Profiles.Lua.Modules.Gui
+{
+    public class EditorButton
+    {
+        private readonly LuaManager _luaManager;
+
+        public EditorButton(LuaManager luaManager, string text, DynValue action)
+        {
+            _luaManager = luaManager;
+            Text = text;
+            Action = action;
+        }
+
+        public void Invoke()
+        {
+            _luaManager.Call(Action);
+        }
+
+        public string Text { get; }
+        public DynValue Action { get; }
+    }
+}
diff --git a/Artemis/Artemis/Profiles/Lua/Modules/LuaGuiModule.cs b/Artemis/Artemis/Profiles/Lua/Modules/LuaGuiModule.cs
index 64b0a411a..78412738c 100644
--- a/Artemis/Artemis/Profiles/Lua/Modules/LuaGuiModule.cs
+++ b/Artemis/Artemis/Profiles/Lua/Modules/LuaGuiModule.cs
@@ -41,10 +41,24 @@ namespace Artemis.Profiles.Lua.Modules
             }
         }
 
+        public void AddEditorButton(string name, DynValue action)
+        {
+            Execute.OnUIThread(() => LuaManager.EditorButtons.Add(new EditorButton(LuaManager, name, action)));
+        }
+
+        public void RemoveEditorButton(string name)
+        {
+            var button = LuaManager.EditorButtons.FirstOrDefault(b => b.Text == name);
+            if (button != null)
+                Execute.OnUIThread(() => LuaManager.EditorButtons.Remove(button));
+        }
+
         public override void Dispose()
         {
             foreach (var window in _windows)
                 window.TryClose();
+
+            Execute.OnUIThread(() => LuaManager.EditorButtons.Clear());
         }
     }
 }
diff --git a/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs b/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs
index d7699475c..b0d3b1daf 100644
--- a/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs
+++ b/Artemis/Artemis/ViewModels/ProfileEditorViewModel.cs
@@ -19,6 +19,7 @@ using Artemis.Profiles;
 using Artemis.Profiles.Layers.Interfaces;
 using Artemis.Profiles.Layers.Models;
 using Artemis.Profiles.Layers.Types.Folder;
+using Artemis.Profiles.Lua.Modules.Gui;
 using Artemis.Properties;
 using Artemis.Services;
 using Artemis.Styles.DropTargetAdorners;
@@ -58,8 +59,7 @@ namespace Artemis.ViewModels
         private LayerModel _selectedLayer;
         private bool _showAll;
 
-        public ProfileEditorViewModel(ProfileEditorModel profileEditorModel, DeviceManager deviceManager,
-            LoopManager loopManager, ModuleModel moduleModel, MetroDialogService dialogService)
+        public ProfileEditorViewModel(ProfileEditorModel profileEditorModel, DeviceManager deviceManager, LoopManager loopManager, LuaManager luaManager, ModuleModel moduleModel, MetroDialogService dialogService)
         {
             _deviceManager = deviceManager;
             _loopManager = loopManager;
@@ -71,6 +71,7 @@ namespace Artemis.ViewModels
             ProfileNames = new ObservableCollection<string>();
             Layers = new ObservableCollection<LayerModel>();
             ProfileEditorModel = profileEditorModel;
+            LuaManager = luaManager;
             ShowAll = true;
 
             PropertyChanged += EditorStateHandler;
@@ -101,6 +102,11 @@ namespace Artemis.ViewModels
 
         #region LUA
 
+        public void ClickedLuaButton(EditorButton button)
+        {
+            button.Invoke();
+        }
+
         public void EditLua()
         {
             if (SelectedProfile == null)
@@ -122,6 +128,7 @@ namespace Artemis.ViewModels
         #region Properties
 
         public ProfileEditorModel ProfileEditorModel { get; }
+        public LuaManager LuaManager { get; }
 
         public ObservableCollection<string> ProfileNames
         {
@@ -711,7 +718,6 @@ namespace Artemis.ViewModels
         }
 
 
-
         private Point GetScaledPosition(MouseEventArgs e)
         {
             var previewSettings = _deviceManager.ActiveKeyboard.PreviewSettings;
diff --git a/Artemis/Artemis/Views/ProfileEditorView.xaml b/Artemis/Artemis/Views/ProfileEditorView.xaml
index 73bb14f49..36632b959 100644
--- a/Artemis/Artemis/Views/ProfileEditorView.xaml
+++ b/Artemis/Artemis/Views/ProfileEditorView.xaml
@@ -1,16 +1,8 @@
-<UserControl x:Class="Artemis.Views.ProfileEditorView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:cal="http://www.caliburnproject.org"
-    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-    xmlns:itemBehaviours="clr-namespace:Artemis.ItemBehaviours"
-    xmlns:dragDrop="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
-    xmlns:converters="clr-namespace:Artemis.Utilities.Converters"
-    xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
-    mc:Ignorable="d"
-    d:DesignHeight="400" d:DesignWidth="1060">
+<UserControl x:Class="Artemis.Views.ProfileEditorView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
+    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:itemBehaviours="clr-namespace:Artemis.ItemBehaviours"
+    xmlns:dragDrop="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop" xmlns:converters="clr-namespace:Artemis.Utilities.Converters"
+    xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" mc:Ignorable="d" d:DesignHeight="400" d:DesignWidth="1060">
     <UserControl.Resources>
         <converters:LayerOrderConverter x:Key="LayerOrderConverter" />
     </UserControl.Resources>
@@ -22,7 +14,8 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="40" />
             <RowDefinition Height="*" />
-            <RowDefinition Height="60" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <!-- Preview -->
@@ -32,7 +25,9 @@
                 <Border.Effect>
                     <DropShadowEffect x:Name="ShadowEffect" ShadowDepth="0" Color="{DynamicResource HighlightColor}" Opacity="1" BlurRadius="25" />
                 </Border.Effect>
-                <Image Source="{Binding Path=KeyboardPreview}" MinHeight="10" MinWidth="10" Stretch="Uniform" Cursor="{Binding Path=KeyboardPreviewCursor}" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}" cal:Message.Attach="
+                <Image Source="{Binding Path=KeyboardPreview}" MinHeight="10" MinWidth="10" Stretch="Uniform" Cursor="{Binding Path=KeyboardPreviewCursor}"
+                    IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}"
+                    cal:Message.Attach="
                            [Event MouseMove] = [Action MouseMoveKeyboardPreview($eventArgs)]; 
                            [Event MouseDown] = [Action MouseDownKeyboardPreview($eventArgs)]; 
                            [Event MouseUp] = [Action MouseUpKeyboardPreview($eventArgs)]" />
@@ -43,8 +38,8 @@
             <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
                 <Label Content="Active profile" />
                 <ComboBox Width="220" VerticalAlignment="Top" x:Name="ProfileNames" Margin="5,0,0,0" />
-                <Button x:Name="AddProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                    Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Add profile">
+                <Button x:Name="AddProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                    ToolTip="Add profile">
                     <Button.Content>
                         <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                             <Rectangle.OpacityMask>
@@ -53,9 +48,8 @@
                         </Rectangle>
                     </Button.Content>
                 </Button>
-                <Button x:Name="RenameProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                    Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Rename profile"
-                    IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}">
+                <Button x:Name="RenameProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                    ToolTip="Rename profile" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}">
                     <Button.Content>
                         <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                             <Rectangle.OpacityMask>
@@ -74,7 +68,8 @@
                         </Rectangle>
                     </Button.Content>
                 </Button>
-                <Button x:Name="DeleteProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Delete profile" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}">
+                <Button x:Name="DeleteProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                    ToolTip="Delete profile" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}">
                     <Button.Content>
                         <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                             <Rectangle.OpacityMask>
@@ -84,17 +79,12 @@
                     </Button.Content>
                 </Button>
             </StackPanel>
-            <TextBlock VerticalAlignment="Top" Foreground="{DynamicResource HighlightBrush}" HorizontalAlignment="Left" Margin="5,5,0,0" Text="Note: To edit a default profile, duplicate it first." FontWeight="Bold" />
         </StackPanel>
-
         <StackPanel Grid.Column="0" Grid.Row="2" Orientation="Horizontal" Margin="0,5,0,0" HorizontalAlignment="Right">
-            <Button x:Name="ImportProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                Height="26" HorizontalAlignment="Right">
+            <Button x:Name="ImportProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Height="26" HorizontalAlignment="Right">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
-                        <Rectangle
-                            Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
-                            Width="12" Height="12" Margin="3,0">
+                        <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12" Margin="3,0">
                             <Rectangle.OpacityMask>
                                 <VisualBrush Visual="{StaticResource appbar_cabinet_in}" Stretch="Fill" />
                             </Rectangle.OpacityMask>
@@ -103,13 +93,11 @@
                     </StackPanel>
                 </Button.Content>
             </Button>
-            <Button x:Name="ExportProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" IsEnabled="{Binding ProfileSelected}">
+            <Button x:Name="ExportProfile" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                IsEnabled="{Binding ProfileSelected}">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
-                        <Rectangle
-                            Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
-                            Width="12" Height="12" Margin="3,0">
+                        <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12" Margin="3,0">
                             <Rectangle.OpacityMask>
                                 <VisualBrush Visual="{StaticResource appbar_cabinet_out}" Stretch="Fill" />
                             </Rectangle.OpacityMask>
@@ -118,14 +106,11 @@
                     </StackPanel>
                 </Button.Content>
             </Button>
-            <Button x:Name="EditLua" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Height="26"
-                HorizontalAlignment="Right" Margin="10,0,0,0" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}"
-                Visibility="{Binding Path=LuaButtonVisible, Converter={StaticResource BoolToVis} }">
+            <Button x:Name="EditLua" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}" Visibility="{Binding Path=LuaButtonVisible, Converter={StaticResource BoolToVis} }">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
-                        <Rectangle
-                            Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"
-                            Width="12" Height="12" Margin="3,0">
+                        <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12" Margin="3,0">
                             <Rectangle.OpacityMask>
                                 <VisualBrush Visual="{StaticResource appbar_code_xml}" Stretch="Fill" />
                             </Rectangle.OpacityMask>
@@ -154,8 +139,7 @@
                 ItemsSource="{Binding Path=Layers, Converter={StaticResource LayerOrderConverter}, ConverterParameter=Order}" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}"
                 cal:Message.Attach="[Event MouseDoubleClick] = [Action EditLayerFromDoubleClick]">
                 <i:Interaction.Behaviors>
-                    <itemBehaviours:BindableSelectedItemBehavior
-                        SelectedItem="{Binding SelectedLayer, Mode=TwoWay}" />
+                    <itemBehaviours:BindableSelectedItemBehavior SelectedItem="{Binding SelectedLayer, Mode=TwoWay}" />
                 </i:Interaction.Behaviors>
                 <TreeView.Resources>
                     <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
@@ -185,9 +169,8 @@
             </TreeView>
         </Border>
         <StackPanel Grid.Column="1" Grid.Row="2" Orientation="Horizontal" Margin="0,5,0,0" HorizontalAlignment="Right">
-            <Button x:Name="AddLayer" VerticalAlignment="Top"
-                Style="{DynamicResource SquareButtonStyle}" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}"
-                Width="26" Height="26" ToolTip="Add layer" HorizontalAlignment="Left">
+            <Button x:Name="AddLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}" Width="26" Height="26"
+                ToolTip="Add layer" HorizontalAlignment="Left">
                 <Button.Content>
                     <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                         <Rectangle.OpacityMask>
@@ -196,9 +179,8 @@
                     </Rectangle>
                 </Button.Content>
             </Button>
-            <Button x:Name="AddFolder" VerticalAlignment="Top"
-                Style="{DynamicResource SquareButtonStyle}" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}"
-                Width="26" Height="26" ToolTip="Add folder" HorizontalAlignment="Left" Margin="10,0,0,0">
+            <Button x:Name="AddFolder" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" IsEnabled="{Binding Path=EditorEnabled, Mode=OneWay}" Width="26" Height="26"
+                ToolTip="Add folder" HorizontalAlignment="Left" Margin="10,0,0,0">
                 <Button.Content>
                     <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                         <Rectangle.OpacityMask>
@@ -207,8 +189,7 @@
                     </Rectangle>
                 </Button.Content>
             </Button>
-            <Button x:Name="EditLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Edit layer"
+            <Button x:Name="EditLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Edit layer"
                 IsEnabled="{Binding Path=LayerSelected}">
                 <Button.Content>
                     <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
@@ -218,9 +199,8 @@
                     </Rectangle>
                 </Button.Content>
             </Button>
-            <Button x:Name="CloneLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Duplicate layer"
-                IsEnabled="{Binding Path=LayerSelected}">
+            <Button x:Name="CloneLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                ToolTip="Duplicate layer" IsEnabled="{Binding Path=LayerSelected}">
                 <Button.Content>
                     <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                         <Rectangle.OpacityMask>
@@ -229,9 +209,8 @@
                     </Rectangle>
                 </Button.Content>
             </Button>
-            <Button x:Name="RemoveLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}"
-                Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0" ToolTip="Delete layer"
-                IsEnabled="{Binding Path=LayerSelected}">
+            <Button x:Name="RemoveLayer" VerticalAlignment="Top" Style="{DynamicResource SquareButtonStyle}" Width="26" Height="26" HorizontalAlignment="Right" Margin="10,0,0,0"
+                ToolTip="Delete layer" IsEnabled="{Binding Path=LayerSelected}">
                 <Button.Content>
                     <Rectangle Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}" Width="12" Height="12">
                         <Rectangle.OpacityMask>
@@ -241,5 +220,21 @@
                 </Button.Content>
             </Button>
         </StackPanel>
+
+        <TextBlock VerticalAlignment="Top" Grid.Column="0" Grid.Row="3" Foreground="{DynamicResource HighlightBrush}" Margin="0,5" HorizontalAlignment="Left"
+            Text="Note: To edit a default profile, duplicate it first." FontWeight="Bold" />
+
+        <ItemsControl ItemsSource="{Binding Path=LuaManager.EditorButtons}" Grid.Column="1" Grid.Row="3" Margin="0,5" HorizontalAlignment="Right">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <Button Content="{Binding Text}" cal:Message.Attach="ClickedLuaButton($dataContext)" Style="{DynamicResource SquareButtonStyle}" Height="26" Margin="5,0,0,0" />
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
     </Grid>
 </UserControl>
\ No newline at end of file