diff --git a/ModManager/Views/Components/ModTweaker.xaml b/ModManager/Views/Components/ModTweaker.xaml
index 9370ac0..7712c82 100644
--- a/ModManager/Views/Components/ModTweaker.xaml
+++ b/ModManager/Views/Components/ModTweaker.xaml
@@ -100,25 +100,29 @@
                                         <DataTemplate>
                                             <Border
                                                 Name="HoverBorder"
-                                                Margin="2"
-                                                Background="{DynamicResource ComponentColorBrush}">
+                                                Margin="0,4"
+                                                Background="{DynamicResource ComponentColorBrush}"
+                                                BorderThickness="1"
+                                                BorderBrush="{DynamicResource InteractiveComponentColorBrush_Light}"
+                                                CornerRadius="3">
                                                 <Grid Margin="5">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition />
-                                                        <ColumnDefinition Width="2*" />
+                                                        <ColumnDefinition Width="1.8*" />
                                                         <ColumnDefinition Width="35" />
                                                     </Grid.ColumnDefinitions>
                                                     <Grid.RowDefinitions>
                                                         <RowDefinition Height="auto" />
                                                         <RowDefinition Height="auto" />
+                                                        <RowDefinition Height="auto" />
                                                     </Grid.RowDefinitions>
                                                     
                                                     <TextBlock Text="{Binding ExposeID}"
                                                                 Style="{StaticResource IMYA_TEXT}"
                                                                 VerticalAlignment="Center"
-                                                                Margin="10,0,0,0"
-                                                                MinWidth="150"
-                                                               FontWeight="SemiBold"/>
+                                                                Margin="3"
+                                                               FontWeight="SemiBold"
+                                                               TextWrapping="Wrap"/>
                                                     <TextBox Grid.Column="1"
                                                              Style="{StaticResource IMYA_TEXTBOX}"
                                                              Text="{Binding Value, Mode=TwoWay}"
@@ -128,7 +132,8 @@
                                                              Visibility="{Binding IsSimpleValue, Converter={StaticResource VisibleOnTrue}}"
                                                              IsEnabled="{Binding DataContext.GameSetup.IsGameRunning, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource NegateBool}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ModTweaker}}}"/>
                                                     <ComboBox Grid.Column="1"
-                                                                Margin="0,0,4,0"
+                                                              Height="36"
+                                                              Margin="0,0,0,4"
                                                                 Style="{StaticResource IMYA_COMBOBOX}"
                                                                 Background="{DynamicResource InteractiveComponentColorBrush}"
                                                                 ItemsSource="{Binding PredefinedValues}"
@@ -188,6 +193,7 @@
                                                                 Style="{StaticResource IMYA_TOGGLESWITCH}"
                                                                 Initialized="CheckBox_Initialized"
                                                                 Checked="OnValueChanged"
+                                                              HorizontalAlignment="Right"
                                                                 Unchecked="OnValueChanged"
                                                                 IsEnabled="{Binding DataContext.GameSetup.IsGameRunning, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource NegateBool}, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:ModTweaker}}}">
                                                     </CheckBox>
@@ -208,12 +214,18 @@
                                                         </materialDesign:PackIcon.ToolTip>
                                                     </materialDesign:PackIcon>
 
+                                                    <Rectangle Height="1" 
+                                                               Fill="{DynamicResource ComponentColorBrush_Inactive}"
+                                                               Grid.Row="1"
+                                                               Grid.ColumnSpan="3"
+                                                               Visibility="{Binding Description, Converter={StaticResource CollapsedOnEmpty}}"></Rectangle>
+
                                                     <!-- description -->
                                                     <TextBlock
-                                                        Grid.Row="1"
+                                                        Grid.Row="2"
                                                         Grid.ColumnSpan="3"
-                                                        Margin="10,2,0,5"
-                                                        TextWrapping="WrapWithOverflow"
+                                                        Margin="4,7,0,5"
+                                                        TextWrapping="Wrap"
                                                         Visibility="{Binding Description, Converter={StaticResource CollapsedOnEmpty}}"
                                                         Style="{StaticResource IMYA_TEXT}"
                                                         Text="{Binding Description}"/>
diff --git a/ModManager_Classes/Models/ModTweaker/DataModel/Tweaking/ExposedModValueFactory.cs b/ModManager_Classes/Models/ModTweaker/DataModel/Tweaking/ExposedModValueFactory.cs
index dee863b..20a75a3 100644
--- a/ModManager_Classes/Models/ModTweaker/DataModel/Tweaking/ExposedModValueFactory.cs
+++ b/ModManager_Classes/Models/ModTweaker/DataModel/Tweaking/ExposedModValueFactory.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
+using System.Xml.XPath;
 
 namespace Imya.Models.ModTweaker.DataModel.Tweaking
 {
@@ -19,6 +20,16 @@ public class ExposedModValueFactory
                 Expose.TryGetAttribute(TweakerConstants.DESCRIPTION, out string? description);
                 Expose.TryGetAttribute(TweakerConstants.TOOLTIP, out string? tooltip);
 
+                try
+                {
+                    var checkPath = XPathExpression.Compile(Path);
+                }
+                catch (XPathException e)
+                {
+                    Console.WriteLine($"Invalid XPath: {ExposeID} - {Path}");
+                    return null; 
+                }
+
                 ExposedModValueType type = ExposedModValueType.SimpleValue;
                 Expose.TryGetAttribute(TweakerConstants.KIND, out string? Kind);
                 if (Kind is string valid_kind && Enum.TryParse<ExposedModValueType>(valid_kind, out var _val))