diff --git a/Artemis/Artemis/Artemis.csproj b/Artemis/Artemis/Artemis.csproj
index 2fcff35a3..c567444ed 100644
--- a/Artemis/Artemis/Artemis.csproj
+++ b/Artemis/Artemis/Artemis.csproj
@@ -411,6 +411,7 @@
     <Compile Include="Modules\Games\RocketLeague\RocketLeagueViewModel.cs" />
     <Compile Include="Modules\Games\Witcher3\Witcher3ViewModel.cs" />
     <Compile Include="ViewModels\LayerEditorViewModel.cs" />
+    <Compile Include="ViewModels\LayerEditor\LayerConditionViewModel.cs" />
     <Compile Include="ViewModels\OverlaysViewModel.cs" />
     <Compile Include="Modules\Overlays\VolumeDisplay\VolumeDisplayViewModel.cs" />
     <Compile Include="ViewModels\ProfileEditorViewModel.cs" />
@@ -453,6 +454,9 @@
     <Compile Include="Views\LayerEditorView.xaml.cs">
       <DependentUpon>LayerEditorView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\LayerEditor\LayerConditionView.xaml.cs">
+      <DependentUpon>LayerConditionView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\OverlaysView.xaml.cs">
       <DependentUpon>OverlaysView.xaml</DependentUpon>
     </Compile>
@@ -606,6 +610,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\LayerEditor\LayerConditionView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\OverlaysView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs
index f42a89928..2ffc9d0e8 100644
--- a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs
+++ b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionDataModel.cs
@@ -1,4 +1,5 @@
-using Artemis.Models.Interfaces;
+using System;
+using Artemis.Models.Interfaces;
 
 namespace Artemis.Modules.Games.TheDivision
 {
@@ -20,6 +21,7 @@ namespace Artemis.Modules.Games.TheDivision
         public TestTest TestyTest { get; set; }
     }
 
+    
     public class TestTest
     {
         public string TestS { get; set; }
diff --git a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml
index 57a5b9df0..48b9924bf 100644
--- a/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml
+++ b/Artemis/Artemis/Modules/Games/TheDivision/TheDivisionView.xaml
@@ -7,52 +7,52 @@
              xmlns:cal="http://www.caliburnproject.org"
              mc:Ignorable="d" 
              d:DesignHeight="416.495" d:DesignWidth="553.608">
-    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-        <Grid Margin="15, 5, 15, 5">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
-                <Label FontSize="20" HorizontalAlignment="Left">
-                    <Label.Content>
-                        <AccessText TextWrapping="Wrap"
-                                    Text="Shows lots of things, I should change this." />
-                    </Label.Content>
-                </Label>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
-                    <ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
-                                  IsChecked="{Binding Path=GameSettings.Enabled, Mode=TwoWay}"
-                                  Style="{DynamicResource MetroCircleToggleButtonStyle}"
-                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
-                </StackPanel>
-            </StackPanel>
-
-            <TextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
-                       TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
-                       Foreground="{DynamicResource HighlightBrush}" MaxWidth="510" TextAlignment="Justify">
-                Note: For this game to work with Artemis, please open up your Division settings, navigate to 3rd Party and set LED keyboard support to Yes. (This only works if you have Artemis running before starting the game)
-            </TextBlock>
-            
-            <!-- Profile editor -->
-            <ContentControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor" />
-            
-            <!-- Buttons -->
-            <StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
-                <Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
-                        Style="{DynamicResource SquareButtonStyle}" />
-                <Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100"
-                        Margin="10,0,0,0"
-                        Style="{DynamicResource SquareButtonStyle}" />
-            </StackPanel>
-        </Grid>
+    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+        <Grid Margin="15, 5, 15, 5">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2">
+                <Label FontSize="20" HorizontalAlignment="Left">
+                    <Label.Content>
+                        <AccessText TextWrapping="Wrap"
+                                    Text="Shows lots of things, I should change this." />
+                    </Label.Content>
+                </Label>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Label Content="Enable effect" Margin="0 3 0 0" HorizontalAlignment="Right" />
+                    <ToggleButton x:Name="EffectEnabled" Margin="0 3 0 0" Width="25" Height="25"
+                                  IsChecked="{Binding Path=GameSettings.Enabled, Mode=TwoWay}"
+                                  Style="{DynamicResource MetroCircleToggleButtonStyle}"
+                                  cal:Message.Attach="[Event Click] = [Action ToggleEffect]" />
+                </StackPanel>
+            </StackPanel>
+
+            <TextBlock Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" Margin="0,8"
+                       TextWrapping="Wrap" HorizontalAlignment="Left" FontFamily="Segoe UI Semibold"
+                       Foreground="{DynamicResource HighlightBrush}" MaxWidth="510" TextAlignment="Justify">
+                Note: For this game to work with Artemis, please open up your Division settings, navigate to 3rd Party and set LED keyboard support to Yes. (This only works if you have Artemis running before starting the game)
+            </TextBlock>
+            
+            <!-- Profile editor -->
+            <ContentControl Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" x:Name="ProfileEditor" />
+            
+            <!-- Buttons -->
+            <StackPanel Grid.Column="0" Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Bottom">
+                <Button x:Name="ResetSettings" Content="Reset effect" VerticalAlignment="Top" Width="100"
+                        Style="{DynamicResource SquareButtonStyle}" />
+                <Button x:Name="SaveSettings" Content="Save changes" VerticalAlignment="Top" Width="100"
+                        Margin="10,0,0,0"
+                        Style="{DynamicResource SquareButtonStyle}" />
+            </StackPanel>
+        </Grid>
     </ScrollViewer>
 </UserControl>
diff --git a/Artemis/Artemis/Utilities/GeneralHelpers.cs b/Artemis/Artemis/Utilities/GeneralHelpers.cs
index cec2042fc..a024dba1c 100644
--- a/Artemis/Artemis/Utilities/GeneralHelpers.cs
+++ b/Artemis/Artemis/Utilities/GeneralHelpers.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using System.Security.Principal;
 using System.Windows;
@@ -53,33 +54,45 @@ namespace Artemis.Utilities
             }
         }
 
-        public static List<PropertyCollection> GetPropertyMap(object o)
-        {
-            var res = new List<PropertyCollection>();
-            // No point reinventing the wheel, just serialize it to JSON and parse that
-            var json = JObject.FromObject(o, JsonSerializer.CreateDefault());
-            res.AddRange(JObjectToPropertyCollection(json));
+        public static List<PropertyCollection> GenerateTypeMap(object o) => GenerateTypeMap(o.GetType().GetProperties());
+        public static List<PropertyCollection> GenerateTypeMap<T>() => GenerateTypeMap(typeof (T).GetProperties());
 
-            return res;
-        }
-
-        private static List<PropertyCollection> JObjectToPropertyCollection(JObject json)
+        private static List<PropertyCollection> GenerateTypeMap(IEnumerable<PropertyInfo> getProperties,
+            string path = "")
         {
-            var res = new List<PropertyCollection>();
-            foreach (var property in json.Properties())
+            var list = new List<PropertyCollection>();
+            foreach (var propertyInfo in getProperties)
             {
-                var parent = new PropertyCollection {Name = property.Name};
-                foreach (var child in property.Children<JObject>())
-                    parent.Children = JObjectToPropertyCollection(child);
+                var parent = new PropertyCollection
+                {
+                    Type = propertyInfo.PropertyType.Name,
+                    Display = $"{path.Replace(".", " → ")}{propertyInfo.Name}",
+                    Path = $"{path}{propertyInfo.Name}"
+                };
 
-                res.Add(parent);
+                if (propertyInfo.PropertyType.BaseType?.Name == "Enum")
+                {
+                    parent.EnumValues = Enum.GetNames(propertyInfo.PropertyType);
+                    parent.Type = "Enum";
+                }
+
+                list.Add(parent);
+                list.AddRange(GenerateTypeMap(propertyInfo.PropertyType.GetProperties(), path + $"{propertyInfo.Name}."));
             }
-            return res;
+            return list;
         }
 
         public struct PropertyCollection
         {
-            public string Name { get; set; }
+            public string Display { get; set; }
+            public string Path { get; set; }
+            public string Type { get; set; }
+
+            /// <summary>
+            ///     Only used if Type is an enumerable
+            /// </summary>
+            public string[] EnumValues { get; set; }
+
             public List<PropertyCollection> Children { get; set; }
         }
     }
diff --git a/Artemis/Artemis/ViewModels/LayerEditor/LayerConditionViewModel.cs b/Artemis/Artemis/ViewModels/LayerEditor/LayerConditionViewModel.cs
new file mode 100644
index 000000000..6d7288c7b
--- /dev/null
+++ b/Artemis/Artemis/ViewModels/LayerEditor/LayerConditionViewModel.cs
@@ -0,0 +1,100 @@
+using System.Linq;
+using Artemis.Models.Profiles;
+using Artemis.Utilities;
+using Caliburn.Micro;
+
+namespace Artemis.ViewModels.LayerEditor
+{
+    public class LayerConditionViewModel<T> : Screen
+    {
+        private readonly LayerEditorViewModel<T> _conditionModel;
+        private GeneralHelpers.PropertyCollection _selectedDataModelProp;
+        private string _selectedOperator;
+        private bool _userValueIsVisible;
+
+        public LayerConditionViewModel(LayerEditorViewModel<T> conditionModel, LayerConditionModel layerConditionModel,
+            BindableCollection<GeneralHelpers.PropertyCollection> dataModelProps)
+        {
+            _conditionModel = conditionModel;
+
+            LayerConditionModel = layerConditionModel;
+            DataModelProps = dataModelProps;
+            Operators = new BindableCollection<string>();
+        }
+
+        public LayerConditionModel LayerConditionModel { get; set; }
+        public BindableCollection<GeneralHelpers.PropertyCollection> DataModelProps { get; set; }
+        public BindableCollection<string> Operators { get; set; }
+
+        public GeneralHelpers.PropertyCollection SelectedDataModelProp
+        {
+            get { return _selectedDataModelProp; }
+            set
+            {
+                if (value.Equals(_selectedDataModelProp)) return;
+                _selectedDataModelProp = value;
+                OnSelectedItemChangedAction(_selectedDataModelProp);
+                NotifyOfPropertyChange(() => SelectedDataModelProp);
+            }
+        }
+
+        public string SelectedOperator
+        {
+            get { return _selectedOperator; }
+            set
+            {
+                if (value == _selectedOperator) return;
+                _selectedOperator = value;
+                NotifyOfPropertyChange(() => SelectedOperator);
+            }
+        }
+
+        public bool UserValueIsVisible
+        {
+            get { return _userValueIsVisible; }
+            set
+            {
+                if (value == _userValueIsVisible) return;
+                _userValueIsVisible = value;
+                NotifyOfPropertyChange(() => UserValueIsVisible);
+            }
+        }
+
+        public void OnSelectedItemChangedAction(GeneralHelpers.PropertyCollection prop)
+        {
+            Operators.Clear();
+            if (prop.EnumValues != null)
+            {
+                Operators.AddRange(prop.EnumValues);
+                UserValueIsVisible = false;
+            }
+            else
+                switch (prop.Type)
+                {
+                    case "Int32":
+                        Operators.AddRange(new[]
+                        {
+                            "Lower than", "Lower or equal to", "Higher than", "Higher or equal to", "Equal to",
+                            "Not equal to"
+                        });
+                        UserValueIsVisible = true;
+                        break;
+                    case "Boolean":
+                        Operators.AddRange(new[] {"False", "True"});
+                        UserValueIsVisible = false;
+                        break;
+                    default:
+                        Operators.AddRange(new[] {"Equal to", "Not equal to"});
+                        UserValueIsVisible = true;
+                        break;
+                }
+
+            SelectedOperator = Operators.First();
+        }
+
+        public void Delete()
+        {
+            _conditionModel.DeleteCondition(this, LayerConditionModel);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs b/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs
index dca5791f4..6532fa054 100644
--- a/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs
+++ b/Artemis/Artemis/ViewModels/LayerEditorViewModel.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Reflection;
+using System.Linq;
 using Artemis.Models.Profiles;
 using Artemis.Utilities;
+using Artemis.ViewModels.LayerEditor;
 using Caliburn.Micro;
 
 namespace Artemis.ViewModels
@@ -15,13 +13,19 @@ namespace Artemis.ViewModels
         public LayerEditorViewModel(LayerModel layer)
         {
             Layer = layer;
-
             DataModelProps = new BindableCollection<GeneralHelpers.PropertyCollection>();
-            DataModelProps.AddRange(GeneralHelpers.GetPropertyMap((T)Activator.CreateInstance(typeof(T), new object[] { })));
+            DataModelProps.AddRange(GeneralHelpers.GenerateTypeMap<T>());
+
+            LayerConditionVms =
+                new BindableCollection<LayerConditionViewModel<T>>(
+                    layer.LayerConditions.Select(c => new LayerConditionViewModel<T>(this, c, DataModelProps)));
+            
             ProposedProperties = new LayerPropertiesModel();
             GeneralHelpers.CopyProperties(ProposedProperties, Layer.LayerUserProperties);
         }
 
+        public BindableCollection<LayerConditionViewModel<T>> LayerConditionVms { get; set; }
+
         public LayerModel Layer
         {
             get { return _layer; }
@@ -37,9 +41,22 @@ namespace Artemis.ViewModels
 
         public LayerPropertiesModel ProposedProperties { get; set; }
 
+        public void AddCondition()
+        {
+            var condition = new LayerConditionModel();
+            Layer.LayerConditions.Add(condition);
+            LayerConditionVms.Add(new LayerConditionViewModel<T>(this, condition, DataModelProps));
+        }
+
         public void Apply()
         {
             GeneralHelpers.CopyProperties(Layer.LayerUserProperties, ProposedProperties);
         }
+
+        public void DeleteCondition(LayerConditionViewModel<T> layerConditionViewModel, LayerConditionModel layerConditionModel)
+        {
+            LayerConditionVms.Remove(layerConditionViewModel);
+            Layer.LayerConditions.Remove(layerConditionModel);
+        }
     }
 }
\ No newline at end of file
diff --git a/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml b/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml
new file mode 100644
index 000000000..d99c8fb92
--- /dev/null
+++ b/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml
@@ -0,0 +1,41 @@
+<UserControl x:Class="Artemis.Views.LayerEditor.LayerConditionView"
+             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:local="clr-namespace:Artemis.Views.LayerEditor"
+             xmlns:cal="http://www.caliburnproject.org"
+             xmlns:utilities="clr-namespace:Artemis.Utilities"
+             mc:Ignorable="d"
+             d:DesignHeight="132.061" d:DesignWidth="632.296">
+    <Grid Margin="10">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="30" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="120" />
+        </Grid.ColumnDefinitions>
+        <!-- Left -->
+        <ComboBox x:Name="DataModelProps" Grid.Column="0" Width="250" MaxDropDownHeight="125"
+                  HorizontalAlignment="Center" VerticalAlignment="Top" DisplayMemberPath="Display" />
+
+        <!-- Center -->
+        <TextBlock Grid.Column="1" Text="is" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="0,3,0,0" />
+        <ComboBox x:Name="Operators" Grid.Column="2" Width="150" MaxDropDownHeight="125" HorizontalAlignment="Center"
+                  VerticalAlignment="Top" Margin="0,0,20,0" />
+
+        <!-- Right -->
+        <Grid Grid.Column="3">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" x:Name="UserValueIsVisible">
+                <TextBox x:Name="UserValue" VerticalAlignment="Top" />
+            </StackPanel>
+            <Button Grid.Row="1" x:Name="Delete" Content="Delete condition" VerticalAlignment="Bottom" Width="100"
+                    Style="{DynamicResource SquareButtonStyle}" HorizontalAlignment="Right" />
+        </Grid>
+
+    </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs b/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs
new file mode 100644
index 000000000..1dd225b05
--- /dev/null
+++ b/Artemis/Artemis/Views/LayerEditor/LayerConditionView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Artemis.Views.LayerEditor
+{
+    /// <summary>
+    /// Interaction logic for LayerConditionView.xaml
+    /// </summary>
+    public partial class LayerConditionView : UserControl
+    {
+        public LayerConditionView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Artemis/Artemis/Views/LayerEditorView.xaml b/Artemis/Artemis/Views/LayerEditorView.xaml
index b51d4d04b..087e0200d 100644
--- a/Artemis/Artemis/Views/LayerEditorView.xaml
+++ b/Artemis/Artemis/Views/LayerEditorView.xaml
@@ -7,56 +7,26 @@
                       xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
                       xmlns:cal="http://www.caliburnproject.org"
                       mc:Ignorable="d"
-                      Title="Artemis | Edit Layer" Height="400" Width="600"
-                      GlowBrush="{DynamicResource AccentColorBrush}" Icon="../logo.ico">
+                      Title="Artemis | Edit Layer" Height="800" Width="630"
+                      GlowBrush="{DynamicResource AccentColorBrush}" Icon="../logo.ico" ResizeMode="NoResize">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
         <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="10" FontSize="16" Text="Display if.." />
-        <ListBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
-            <ListBoxItem Margin="10, 0, 10, 0" Padding="10">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <!-- Left -->
-                    <Border BorderThickness="1" BorderBrush="{DynamicResource GrayBrush6}">
-                        <TreeView x:Name="ProfileTree" ItemsSource="{Binding Path=DataModelProps}" Width="200"
-                                  Height="100">
-                            <TreeView.ItemTemplate>
-                                <HierarchicalDataTemplate ItemsSource="{Binding Children}">
-                                    <TextBlock Text="{Binding Name}" />
-                                </HierarchicalDataTemplate>
-                            </TreeView.ItemTemplate>
-                        </TreeView>
-                    </Border>
-
-                    <!-- Center -->
-                    <TextBlock Grid.Column="1" Text="is" VerticalAlignment="Top" HorizontalAlignment="Center"
-                               Margin="0,3,0,0" />
-                    <ComboBox Grid.Column="2" Width="60" IsEditable="True" MaxDropDownHeight="125"
-                              Style="{DynamicResource VirtualisedMetroComboBox}" HorizontalAlignment="Center"
-                              VerticalAlignment="Top" ItemsSource="{Binding Path=DataModelProps}" />
-                    <TextBlock Grid.Column="3" Text="than" VerticalAlignment="Top" HorizontalAlignment="Center"
-                               Margin="0,3,0,0" />
-
-                    <!-- Right -->
-                    <TextBox Grid.Column="4" Width="200" VerticalAlignment="Top" />
-                </Grid>
-            </ListBoxItem>
-        </ListBox>
-
+        <ListBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" x:Name="LayerConditionVms" />
+        <Button Grid.Row="2" Grid.Column="0" x:Name="AddCondition" Content="Add condition" VerticalAlignment="Top"
+                Style="{DynamicResource SquareButtonStyle}" Width="95" HorizontalAlignment="Left" Margin="10" />
+        <Button Grid.Row="3" Grid.Column="0" x:Name="Apply" Content="Apply" VerticalAlignment="Bottom"
+                Style="{DynamicResource SquareButtonStyle}" Width="95" HorizontalAlignment="Left" Margin="10" />
     </Grid>
+    
 </controls:MetroWindow>
\ No newline at end of file