diff --git a/Common/Dino.cs b/Common/Dino.cs
index 7988d2a..b1fbbe4 100644
--- a/Common/Dino.cs
+++ b/Common/Dino.cs
@@ -10,6 +10,7 @@ public class Dino : IEquatable<Dino>
         public string Name { get; set; }
         public int BaseLevel { get; set; }
         public bool Female { get; set; }
+        public bool IsTameable { get; set; }
         public Position Location { get; set; }
         public StatPoints WildLevels { get; set; }
 
@@ -26,6 +27,7 @@ public bool Equals(Dino other)
                    Name == other.Name &&
                    BaseLevel == other.BaseLevel &&
                    Female == other.Female &&
+                   IsTameable == other.IsTameable &&
                    EqualityComparer<Position>.Default.Equals(Location, other.Location) &&
                    EqualityComparer<StatPoints>.Default.Equals(WildLevels, other.WildLevels);
         }
@@ -38,6 +40,7 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name);
             hashCode = hashCode * -1521134295 + BaseLevel.GetHashCode();
             hashCode = hashCode * -1521134295 + Female.GetHashCode();
+            hashCode = hashCode * -1521134295 + IsTameable.GetHashCode();
             hashCode = hashCode * -1521134295 + EqualityComparer<Position>.Default.GetHashCode(Location);
             hashCode = hashCode * -1521134295 + EqualityComparer<StatPoints>.Default.GetHashCode(WildLevels);
             return hashCode;
diff --git a/Common/SearchCriteria.cs b/Common/SearchCriteria.cs
index d9292c3..a2ac992 100644
--- a/Common/SearchCriteria.cs
+++ b/Common/SearchCriteria.cs
@@ -26,6 +26,7 @@ public SearchCriteria(SearchCriteria copy)
             MinLevel = copy.MinLevel;
             MaxLevel = copy.MaxLevel;
             Female = copy.Female;
+            GroupSearch = copy.GroupSearch;
         }
 
         public string Group { get; set; }
@@ -34,6 +35,7 @@ public SearchCriteria(SearchCriteria copy)
         public int? MinLevel { get; set; }
         public int? MaxLevel { get; set; }
         public bool? Female { get; set; }
+        public bool GroupSearch { get; set; }
 
         /// <summary>
         /// Compares equality based only on an internal random ID assigned on creation.
diff --git a/Common/StatPoints.cs b/Common/StatPoints.cs
index 30e3581..7f2c95d 100644
--- a/Common/StatPoints.cs
+++ b/Common/StatPoints.cs
@@ -9,6 +9,8 @@ public class StatPoints : IEquatable<StatPoints>
         public int Weight { get; set; }
         public int Melee { get; set; }
         public int Speed { get; set; }
+        public int Food { get; set; }
+        public int Oxygen { get; set; }
 
         public override bool Equals(object obj)
         {
@@ -22,7 +24,9 @@ public bool Equals(StatPoints other)
                    Stamina == other.Stamina &&
                    Weight == other.Weight &&
                    Melee == other.Melee &&
-                   Speed == other.Speed;
+                   Speed == other.Speed &&
+                   Food == other.Food &&
+                   Oxygen == other.Oxygen;
         }
 
         public override int GetHashCode()
@@ -33,18 +37,20 @@ public override int GetHashCode()
             hashCode = hashCode * -1521134295 + Weight.GetHashCode();
             hashCode = hashCode * -1521134295 + Melee.GetHashCode();
             hashCode = hashCode * -1521134295 + Speed.GetHashCode();
+            hashCode = hashCode * -1521134295 + Food.GetHashCode();
+            hashCode = hashCode * -1521134295 + Oxygen.GetHashCode();
             return hashCode;
         }
 
         public override string ToString()
         {
-            return $"{Health}/{Stamina}/{Weight}/{Melee}/{Speed}";
+            return $"{Health}/{Stamina}/{Oxygen}/{Food}/{Weight}/{Melee}/{Speed}";
         }
 
         public string ToString(bool fixedWidth = false)
         {
             if (fixedWidth)
-                return $"{Health,2}/{Stamina,2}/{Weight,2}/{Melee,2}/{Speed,2}";
+                return $"{Health,2}/{Stamina,2}/{Oxygen,2}/{Food,2}//{Weight,2}{Melee,2}/{Speed,2}";
             else
                 return ToString();
         }
diff --git a/LarkatorGUI/ArkReader.cs b/LarkatorGUI/ArkReader.cs
index 4640904..7bbd59f 100644
--- a/LarkatorGUI/ArkReader.cs
+++ b/LarkatorGUI/ArkReader.cs
@@ -120,16 +120,19 @@ private Dino ConvertCreature(GameObject obj)
                 Id = (ulong)obj.GetDinoId(),
                 BaseLevel = obj.GetBaseLevel(),
                 Name = obj.GetPropertyValue("TamedName", defaultValue: ""),
+                IsTameable = !obj.GetPropertyValue("bForceDisablingTaming", defaultValue: false),
                 Location = ConvertCoordsToLatLong(obj.Location),
                 WildLevels = new StatPoints(),
             };
-
+        
             var status = obj.CharacterStatusComponent();
             if (status != null)
             {
                 var defaultValue = new ArkByteValue(0);
                 dino.WildLevels.Health = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 0, defaultValue).ByteValue;
                 dino.WildLevels.Stamina = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 1, defaultValue).ByteValue;
+                dino.WildLevels.Oxygen = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 3, defaultValue).ByteValue;
+                dino.WildLevels.Food = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 4, defaultValue).ByteValue;
                 dino.WildLevels.Weight = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 7, defaultValue).ByteValue;
                 dino.WildLevels.Melee = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 8, defaultValue).ByteValue;
                 dino.WildLevels.Speed = status.GetPropertyValue("NumberOfLevelUpPointsApplied", 9, defaultValue).ByteValue;
diff --git a/LarkatorGUI/Converters.cs b/LarkatorGUI/Converters.cs
index ce2745e..2d39f4d 100644
--- a/LarkatorGUI/Converters.cs
+++ b/LarkatorGUI/Converters.cs
@@ -132,7 +132,62 @@ public class DinoToTooltipConverter : IValueConverter
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             var v = (Dino)value;
-            return $"{(String.IsNullOrWhiteSpace(v.Name) ? "" : "\"" + v.Name + "\" ")}{v.Type} {(v.Female ? 'F' : 'M')}{v.BaseLevel} @ {v.Location.ToString(PositionFormat.LatLong)} ({v.Location.ToString(PositionFormat.XYZ)})";
+            String displayStats = "";
+            //Build the string to display only shown stats
+            //Health, Stamina, Oxygen, Food, Weight, Melee, Speed
+            if (Properties.Settings.Default.ShowHealth)
+            {
+                displayStats += v.WildLevels.Health;
+            }
+            if (Properties.Settings.Default.ShowStam)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Stamina;
+            }
+            if (Properties.Settings.Default.ShowOxygen)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Oxygen;
+            }
+            if (Properties.Settings.Default.ShowFood)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Food;
+            }
+            if (Properties.Settings.Default.ShowWeight)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Weight;
+            }
+            if (Properties.Settings.Default.ShowMelee)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Melee;
+            }
+            if (Properties.Settings.Default.ShowSpeed)
+            {
+                if (!displayStats.Equals(""))
+                {
+                    displayStats += "/";
+                }
+                displayStats += v.WildLevels.Speed;
+            }
+            return $"{(String.IsNullOrWhiteSpace(v.Name) ? "" : "\"" + v.Name + "\" ")}{v.Type} {(v.Female ? 'F' : 'M')}{v.BaseLevel} @ {v.Location.ToString(PositionFormat.LatLong)} ({v.Location.ToString(PositionFormat.XYZ)}) ({displayStats})";
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/LarkatorGUI/LarkatorGUI.csproj b/LarkatorGUI/LarkatorGUI.csproj
index 8d06aa7..acb544a 100644
--- a/LarkatorGUI/LarkatorGUI.csproj
+++ b/LarkatorGUI/LarkatorGUI.csproj
@@ -240,6 +240,7 @@
     <Resource Include="imgs\map_ScorchedEarth.jpg" />
     <Resource Include="imgs\map_TheCenter.jpg" />
     <Resource Include="imgs\map_TheIsland.jpg" />
+    <Resource Include="imgs\map_Valguero_P.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="imgs\map_Extinction.jpg" />
diff --git a/LarkatorGUI/MainWindow.xaml b/LarkatorGUI/MainWindow.xaml
index 782bc5f..6a43982 100644
--- a/LarkatorGUI/MainWindow.xaml
+++ b/LarkatorGUI/MainWindow.xaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:LarkatorGUI"
+        xmlns:properties="clr-namespace:LarkatorGUI.Properties"
         xmlns:common="clr-namespace:Larkator.Common;assembly=Larkator.Common"
         xmlns:fa="http://schemas.fontawesome.io/icons/"
         xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
@@ -313,18 +314,24 @@
                     </StackPanel>
                     <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="16" Content="+" Click="CreateSearch_Click"
                             Visibility="{Binding CreateSearchAvailable, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                    <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
+                        <Grid Margin="16,0,16,16" Visibility="{Binding NewSearchActive, Converter={StaticResource BoolToVisibilityConverter}}" Background="#44ffffff">
                         <StackPanel Margin="8" Orientation="Vertical" HorizontalAlignment="Stretch" DataContext="{Binding NewSearch}">
-                            <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True"/>
-                            <ComboBox x:Name="speciesCombo" Text="{Binding Species}"/>
+                            <ComboBox x:Name="groupsCombo" Text="{Binding Group}" IsEditable="True" />
+                            <ComboBox x:Name="speciesCombo" Text="{Binding Species}" IsEditable="True" StaysOpenOnEdit="True" GotFocus="ComboOpen" AllowDrop="True"/>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
-                                <TextBlock Text="Min"/>
+                                <TextBlock Text="Min "/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>
                             </StackPanel>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
-                                <TextBlock Text="Max"/>
+                                <TextBlock Text="Max "/>
                                 <TextBlock Text="{Binding MinLevel, ConverterParameter=-, Converter={StaticResource OptionalIntConverter}}" MinWidth="64" MouseWheel="AdjustableInteger_MouseWheel"/>
                             </StackPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="4">
+                                <TextBlock Text="Grouped search "/>
+                                <CheckBox x:Name="groupCheck" ToolTip="Keyword search for a group of dinosaurs"
+                                               IsChecked="{Binding Source={StaticResource Settings}, Path=Settings.GroupSearch, Mode=TwoWay}" HorizontalAlignment="Right"
+                                               Margin="7,4"/>
+                            </StackPanel>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                 <Button Width="32" FontFamily="Arial Black" FontSize="28" FontWeight="Bold" Padding="-4" Margin="4,0" Content="+" Click="SaveSearch_Click" />
                                 <TextBlock VerticalAlignment="Center" MouseDown="CloseNewSearch_Click"><Underline><Run Text="X"/></Underline></TextBlock>
@@ -378,11 +385,13 @@
                         </DataGridTemplateColumn>
                         <DataGridTextColumn Header="Lvl" Width="1.2*" Binding="{Binding Dino.BaseLevel}"/>
                         <DataGridTextColumn Header="Pos" Width="2.2*" Binding="{Binding Path=Dino.Location, Converter={StaticResource PositionToStringConverter}}"/>
-                        <DataGridTextColumn Header="Hp" Width="1*" Binding="{Binding Path=Dino.WildLevels.Health}"/>
-                        <DataGridTextColumn Header="St" Width="1*" Binding="{Binding Path=Dino.WildLevels.Stamina}"/>
-                        <DataGridTextColumn Header="We" Width="1*" Binding="{Binding Path=Dino.WildLevels.Weight}"/>
-                        <DataGridTextColumn Header="Me" Width="1*" Binding="{Binding Path=Dino.WildLevels.Melee}"/>
-                        <DataGridTextColumn Header="Sp" Width="1*" Binding="{Binding Path=Dino.WildLevels.Speed}"/>
+                        <DataGridTextColumn x:Name="health" Header="Hp" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowHealth, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Health}"/>
+                        <DataGridTextColumn x:Name="stamina" Header="St" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowStam, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Stamina}"/>
+                        <DataGridTextColumn x:Name="oxygen" Header="Ox" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowOxygen, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Weight}"/>
+                        <DataGridTextColumn x:Name="food" Header="Fd" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowFood, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Melee}"/>
+                        <DataGridTextColumn x:Name="weight" Header="We" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowWeight, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Speed}"/>
+                        <DataGridTextColumn x:Name="melee" Header="Me" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowMelee, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Food}"/>
+                        <DataGridTextColumn x:Name="speed" Header="Sp" Visibility="{Binding Source={StaticResource Settings}, Path=Default.ShowSpeed, Converter={StaticResource BoolToVisibilityConverter}}" Width="1*" Binding="{Binding Path=Dino.WildLevels.Oxygen}"/>
                     </DataGrid.Columns>
                 </DataGrid>
 
@@ -398,6 +407,7 @@
                         <fa:ImageAwesome Icon="Remove" Height="30" Width="30" Margin="8" Foreground="#88FFFF00" ToolTip="Remove user settings &amp; exit" MouseDown="Dev_RemoveSettings_Click"/>
                     </StackPanel>
                     <fa:ImageAwesome Icon="cogs" Width="30" Height="30" Margin="8" Foreground="#44ffffff" ToolTip="Settings" MouseDown="Settings_Click"/>
+                    <fa:ImageAwesome Icon="refresh" Width="30" Height="30" Margin="8" Foreground="#44ffffff" ToolTip="Refresh" Visibility="Hidden" MouseDown="Refresh_Click"/>
                 </StackPanel>
             </Grid>
         </Grid>
diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
index 54ed2a8..2811900 100644
--- a/LarkatorGUI/MainWindow.xaml.cs
+++ b/LarkatorGUI/MainWindow.xaml.cs
@@ -176,7 +176,7 @@ public bool ShowCounts
         private string lastArk;
         private DebounceDispatcher refreshSearchesTimer = new DebounceDispatcher();
         private DebounceDispatcher settingsSaveTimer = new DebounceDispatcher();
-
+        
         public MainWindow()
         {
             ValidateWindowPositionAndSize();
@@ -189,6 +189,7 @@ public MainWindow()
             DiscoverCalibration();
 
             DataContext = this;
+            this.MouseDown += new MouseButtonEventHandler(window_MouseDown);
 
             InitializeComponent();
 
@@ -439,7 +440,7 @@ private void CopyTeleport_Click(object sender, RoutedEventArgs e)
             {
                 var z = dvm.Dino.Location.Z + Properties.Settings.Default.TeleportHeightOffset;
                 var clipboard = "cheat SetPlayerPos ";
-                clipboard += $"{dvm.Dino.Location.X:0.00} {dvm.Dino.Location.Y:0.00} {z:0.00}";
+                clipboard += System.FormattableString.Invariant($"{dvm.Dino.Location.X:0.00} {dvm.Dino.Location.Y:0.00} {z:0.00}");
                 if (Properties.Settings.Default.TeleportFly)
                 {
                     clipboard += " | cheat fly";
@@ -476,6 +477,7 @@ private void CreateSearch_Click(object sender, RoutedEventArgs e)
 
             speciesCombo.ItemsSource = arkReader.AllSpecies;
             groupsCombo.ItemsSource = ListSearches.Select(sc => sc.Group).Distinct().OrderBy(g => g).ToArray();
+            groupsCombo.SelectedItem = Properties.Settings.Default.LastGroup;
         }
 
         private void Dev_Calibration_Click(object sender, MouseButtonEventArgs e)
@@ -527,15 +529,69 @@ private void SaveSearch_Click(object sender, RoutedEventArgs e)
         {
             if (String.IsNullOrWhiteSpace(NewSearch.Species)) return;
 
+            List<String> NewSearchList = new List<String>(AllSpecies.Where(species => species.Contains(NewSearch.Species)));
+            SearchCriteria tempSearch;
+            int order = 100;
+
+            //If we lose our selection default back to Shopping List
             try
             {
-                NewSearch.Order = ListSearches.Where(sc => sc.Group == NewSearch.Group).Max(sc => sc.Order) + 100;
+                Properties.Settings.Default.LastGroup = groupsCombo.Text;
+            }
+            catch 
+            {
+                Properties.Settings.Default.LastGroup = "Shopping List";
+            }
+            //Set and save property
+            Properties.Settings.Default.GroupSearch = (bool) groupCheck.IsChecked;
+            Properties.Settings.Default.Save();
+            
+
+            if (NewSearchList.Count == 0) // No matches
+            { //Trigger default values so the user knows we did search to match
+                NewSearch = null;
+                tempSearch = null;
+                NewSearchActive = false;
+                CreateSearchAvailable = true;
+                return; 
+            }
+            ObservableCollection<SearchCriteria> tempListSearch = new ObservableCollection<SearchCriteria>(ListSearches.Where(sc => sc.Group == (String)groupsCombo.SelectedValue));
+            if (tempListSearch.Count > 0)
+            {
+                order = (int)ListSearches.Where(sc => sc.Group == NewSearch.Group).Max(sc => sc.Order) + 100;
+            }
+            //check for group based search
+            if (Properties.Settings.Default.GroupSearch)
+            {
+                tempSearch = new SearchCriteria(NewSearch);
+                tempSearch.Species = NewSearch.Species;
+                tempSearch.Order = order; //Sort order
+                tempSearch.GroupSearch = Properties.Settings.Default.GroupSearch;
+                ListSearches.Add(tempSearch);
+            }
+            else {
+                try
+                {
+                    foreach (String newDino in NewSearchList)
+                    {
+                        if (tempListSearch.Count == 0 || tempListSearch.Where(dino => dino.Species == newDino).Count() == 0)
+                        {
+                            tempSearch = new SearchCriteria(NewSearch);
+                            tempSearch.Species = newDino;
+                            tempSearch.Order = order;
+                            tempSearch.GroupSearch = Properties.Settings.Default.GroupSearch;
+                            ListSearches.Add(tempSearch);
+                            order += 100;
+                        }
+                    }
+                }
+                catch (InvalidOperationException) // no entries for .Max - ignore
+                { }
             }
-            catch (InvalidOperationException) // no entries for .Max - ignore
-            { }
 
-            ListSearches.Add(NewSearch);
+
             NewSearch = null;
+            tempSearch = null;
             NewSearchActive = false;
             CreateSearchAvailable = true;
 
@@ -576,6 +632,11 @@ private void Settings_Click(object sender, MouseButtonEventArgs e)
             OnSettingsChanged();
         }
 
+        private async void Refresh_Click(object sender, MouseButtonEventArgs e)
+        {
+            await ReReadArk();
+        }
+
         private void AdjustableInteger_MouseWheel(object sender, MouseWheelEventArgs e)
         {
             var tb = (TextBlock)sender;
@@ -716,6 +777,21 @@ private void UpdateSearchResults(IList<SearchCriteria> searches)
                             total += speciesDinos.Count;
                         }
                     }
+                    else if (search.GroupSearch)
+                    {
+                        List<String> NewSearchList = new List<String>(AllSpecies.Where(species => species.Contains(search.Species)));
+                        foreach (String newDino in NewSearchList)
+                        {
+                            if (sourceDinos.ContainsKey(newDino))
+                            {
+                                var dinoList = sourceDinos[newDino];
+                                //found.AddRange(dinoList.Where(d => search.Matches(d)));
+                                found.AddRange(dinoList);
+                                total += dinoList.Count;
+                            }
+                        }
+
+                    }
                     else
                     {
                         if (sourceDinos.ContainsKey(search.Species))
@@ -729,11 +805,13 @@ private void UpdateSearchResults(IList<SearchCriteria> searches)
 
                 ListResults.Clear();
                 foreach (var result in found)
-                    ListResults.Add(result);
+                    if (!Properties.Settings.Default.HideUntameable || (result.IsTameable))
+                        ListResults.Add(result);
 
                 ShowCounts = true;
                 ResultTotalCount = ShowTames ? sourceDinos.Sum(species => species.Value.Count()) : total;
                 ResultMatchingCount = ListResults.Count;
+
             }
 
             ((CollectionViewSource)Resources["OrderedResults"]).View.Refresh();
@@ -864,7 +942,6 @@ private void OnSettingsChanged()
             UpdateCurrentSearch();
 
             ForceFontSizeUpdate();
-
             reloadTimer.Interval = TimeSpan.FromMilliseconds(Properties.Settings.Default.ConvertDelay);
         }
 
@@ -929,5 +1006,16 @@ private async Task WaitForNameSearch()
                     dvm.Highlight = (dvm.Dino.Name != null) && dvm.Dino.Name.Contains(searchText);
             }
         }
+
+        private void ComboOpen(object sender, EventArgs e)
+        {
+            //Open the box when we first click into the text
+            speciesCombo.IsDropDownOpen = true;
+        }
+
+        private void window_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            Keyboard.ClearFocus();
+        }
     }
 }
diff --git a/LarkatorGUI/Properties/Settings.Designer.cs b/LarkatorGUI/Properties/Settings.Designer.cs
index 9c1ee83..5a66ada 100644
--- a/LarkatorGUI/Properties/Settings.Designer.cs
+++ b/LarkatorGUI/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace LarkatorGUI.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -236,5 +236,125 @@ public bool TeleportGhost {
                 this["TeleportGhost"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ShowHealth {
+            get {
+                return ((bool)(this["ShowHealth"]));
+            }
+            set {
+                this["ShowHealth"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ShowStam {
+            get {
+                return ((bool)(this["ShowStam"]));
+            }
+            set {
+                this["ShowStam"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool ShowOxygen {
+            get {
+                return ((bool)(this["ShowOxygen"]));
+            }
+            set {
+                this["ShowOxygen"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool ShowFood {
+            get {
+                return ((bool)(this["ShowFood"]));
+            }
+            set {
+                this["ShowFood"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ShowWeight {
+            get {
+                return ((bool)(this["ShowWeight"]));
+            }
+            set {
+                this["ShowWeight"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ShowMelee {
+            get {
+                return ((bool)(this["ShowMelee"]));
+            }
+            set {
+                this["ShowMelee"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool ShowSpeed {
+            get {
+                return ((bool)(this["ShowSpeed"]));
+            }
+            set {
+                this["ShowSpeed"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Shopping List")]
+        public string LastGroup {
+            get {
+                return ((string)(this["LastGroup"]));
+            }
+            set {
+                this["LastGroup"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool HideUntameable {
+            get {
+                return ((bool)(this["HideUntameable"]));
+            }
+            set {
+                this["HideUntameable"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool GroupSearch {
+            get {
+                return ((bool)(this["GroupSearch"]));
+            }
+            set {
+                this["GroupSearch"] = value;
+            }
+        }
     }
 }
diff --git a/LarkatorGUI/Properties/Settings.settings b/LarkatorGUI/Properties/Settings.settings
index 175a717..7e719fc 100644
--- a/LarkatorGUI/Properties/Settings.settings
+++ b/LarkatorGUI/Properties/Settings.settings
@@ -50,5 +50,35 @@
     <Setting Name="TeleportGhost" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ShowHealth" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="ShowStam" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="ShowOxygen" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="ShowFood" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="ShowWeight" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="ShowMelee" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="ShowSpeed" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="LastGroup" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Shopping List</Value>
+    </Setting>
+    <Setting Name="HideUntameable" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="GroupSearch" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/LarkatorGUI/SettingsWindow.xaml b/LarkatorGUI/SettingsWindow.xaml
index 5111133..6609d6a 100644
--- a/LarkatorGUI/SettingsWindow.xaml
+++ b/LarkatorGUI/SettingsWindow.xaml
@@ -37,6 +37,7 @@
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="1" Grid.Column="0">
@@ -100,7 +101,7 @@
                                                IsChecked="{Binding Source={StaticResource Model}, Path=Settings.TeleportFly, Mode=TwoWay}" HorizontalAlignment="Right"
                                                Margin="7,4"/>
             </Border>
-            
+
             <Border Grid.Row="8" Grid.Column="0">
                 <TextBlock VerticalAlignment="Center" Margin="0,0,4,0">Enable ghost after teleport</TextBlock>
             </Border>
@@ -109,7 +110,79 @@
                                                IsChecked="{Binding Source={StaticResource Model}, Path=Settings.TeleportGhost, Mode=TwoWay}" HorizontalAlignment="Right"
                                                Margin="7,4"/>
             </Border>
+            <Border Grid.Row="9" Grid.Column="0">
+                <TextBlock VerticalAlignment="Center" Margin="0,0,4,0">Hide untameable dinosaurs</TextBlock>
+            </Border>
+            <Border Grid.Row="9" Grid.Column="1">
+                <CheckBox ToolTip="Hide dinosaurs that cannot be tamed"
+                                               IsChecked="{Binding Source={StaticResource Model}, Path=Settings.hideUntameable, Mode=TwoWay}" HorizontalAlignment="Right"
+                                               Margin="7,4"/>
+            </Border>
         </Grid>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="2.5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Border Grid.Row="0" Grid.Column="2">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">Hp</TextBlock>
+            </Border>
+            <Border Grid.Row="0" Grid.Column="3">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">St</TextBlock>
+            </Border>
+            <Border Grid.Row="0" Grid.Column="4">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">Ox</TextBlock>
+            </Border>
+            <Border Grid.Row="0" Grid.Column="5">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">Fd</TextBlock>
+            </Border>
+            <Border Grid.Row="0" Grid.Column="6">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">We</TextBlock>
+            </Border>
+            <Border Grid.Row="0" Grid.Column="7">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">Me</TextBlock>
+            </Border>
+            <Border Grid.Row="0" Grid.Column="8">
+                <TextBlock VerticalAlignment="Center" HorizontalAlignment="Right" Margin="7,4">Sp</TextBlock>
+            </Border>
+
+            <Border Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2">
+                <TextBlock VerticalAlignment="Center" Margin="0,0,4,0">Display stats</TextBlock>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="2">
+                <CheckBox ToolTip="Display Health" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowHealth, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="3">
+                <CheckBox ToolTip="Display Stamina" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowStam, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="4">
+                <CheckBox ToolTip="Display Oxygen" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowOxygen, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="5">
+                <CheckBox ToolTip="Display Food" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowFood, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="6">
+                <CheckBox ToolTip="Display Weight" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowWeight, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="7">
+                <CheckBox ToolTip="Display Melee" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowMelee, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+            <Border Grid.Row="1" Grid.Column="8">
+                <CheckBox ToolTip="Display Speed" IsChecked="{Binding Source={StaticResource Model}, Path=Settings.ShowSpeed, Mode=TwoWay}" HorizontalAlignment="Right" Margin="7,4"/>
+            </Border>
+        </Grid>
+
         <DockPanel Margin="4,6,6,4" LastChildFill="True">
             <TextBlock Text="Restore all defaults" DockPanel.Dock="Left" VerticalAlignment="Bottom" TextDecorations="Underline" MouseDown="Restore_MouseDown" FontSize="10"/>
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
diff --git a/LarkatorGUI/app.config b/LarkatorGUI/app.config
index 93cbee7..f5bfa42 100644
--- a/LarkatorGUI/app.config
+++ b/LarkatorGUI/app.config
@@ -55,6 +55,36 @@
             <setting name="TeleportGhost" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="ShowHealth" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="ShowStam" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="ShowOxygen" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ShowFood" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ShowWeight" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="ShowMelee" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="ShowSpeed" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="LastGroup" serializeAs="String">
+                <value>Shopping List</value>
+            </setting>
+            <setting name="HideUntameable" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="GroupSearch" serializeAs="String">
+                <value>False</value>
+            </setting>
         </LarkatorGUI.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/LarkatorGUI/calibrations.json b/LarkatorGUI/calibrations.json
index 801b526..a6c7032 100644
--- a/LarkatorGUI/calibrations.json
+++ b/LarkatorGUI/calibrations.json
@@ -1,68 +1,79 @@
 [
-    {
-        "Filename": "TheIsland",
-        "LatOffset": 50,
-        "LatDivisor": 8000,
-        "LonOffset": 50,
-        "LonDivisor": 8000,
-        "PixelOffsetX": 18.375,
-        "PixelOffsetY": 23.75,
-        "PixelScaleX": 9.55,
-        "PixelScaleY": 9.625
-    },
-    {
-        "Filename": "TheCenter",
-        "LatOffset": 30.30309,
-        "LatDivisor": 9584.15646605143,
-        "LonOffset": 55,
-        "LonDivisor": 9600.55903111401,
-        "PixelOffsetX": 18.875,
-        "PixelOffsetY": 50.75,
-        "PixelScaleX": 9.1,
-        "PixelScaleY": 9.1
-    },
-    {
-        "Filename": "Aberration",
-        "LatOffset": 50,
-        "LatDivisor": 8000,
-        "LonOffset": 50,
-        "LonDivisor": 8000,
-        "PixelOffsetX": 15.125,
-        "PixelOffsetY": 19.0,
-        "PixelScaleX": 9.8875,
-        "PixelScaleY": 9.7
-    },
-    {
-        "Filename": "Ragnarok",
-        "LatOffset": 50,
-        "LatDivisor": 13100,
-        "LonOffset": 50,
-        "LonDivisor": 13100,
-        "PixelOffsetX": 15.25,
-        "PixelOffsetY": 19,
-        "PixelScaleX": 9.7,
-        "PixelScaleY": 9.7
-    },
-    {
-        "Filename": "ScorchedEarth",
-        "LatOffset": 50,
-        "LatDivisor": 8000,
-        "LonOffset": 50,
-        "LonDivisor": 8000,
-        "PixelOffsetX": 13.875,
-        "PixelOffsetY": 21.125,
-        "PixelScaleX": 9.9125,
-        "PixelScaleY": 9.6875
-    },
-    {
-        "Filename": "Extinction",
-        "LatOffset": 50,
-        "LatDivisor": 8000,
-        "LonOffset": 50,
-        "LonDivisor": 8000,
-        "PixelOffsetX": 92.375,
-        "PixelOffsetY": 86.125,
-        "PixelScaleX": 8.4625,
-        "PixelScaleY": 8.2875
-    }
+  {
+    "Filename": "TheIsland",
+    "LatOffset": 50,
+    "LatDivisor": 8000,
+    "LonOffset": 50,
+    "LonDivisor": 8000,
+    "PixelOffsetX": 18.375,
+    "PixelOffsetY": 23.75,
+    "PixelScaleX": 9.55,
+    "PixelScaleY": 9.625
+  },
+  {
+    "Filename": "TheCenter",
+    "LatOffset": 30.30309,
+    "LatDivisor": 9584.15646605143,
+    "LonOffset": 55,
+    "LonDivisor": 9600.55903111401,
+    "PixelOffsetX": 18.875,
+    "PixelOffsetY": 50.75,
+    "PixelScaleX": 9.1,
+    "PixelScaleY": 9.1
+  },
+  {
+    "Filename": "Aberration",
+    "LatOffset": 50,
+    "LatDivisor": 8000,
+    "LonOffset": 50,
+    "LonDivisor": 8000,
+    "PixelOffsetX": 15.125,
+    "PixelOffsetY": 19.0,
+    "PixelScaleX": 9.8875,
+    "PixelScaleY": 9.7
+  },
+  {
+    "Filename": "Ragnarok",
+    "LatOffset": 50,
+    "LatDivisor": 13100,
+    "LonOffset": 50,
+    "LonDivisor": 13100,
+    "PixelOffsetX": 15.25,
+    "PixelOffsetY": 19,
+    "PixelScaleX": 9.7,
+    "PixelScaleY": 9.7
+  },
+  {
+    "Filename": "ScorchedEarth",
+    "LatOffset": 50,
+    "LatDivisor": 8000,
+    "LonOffset": 50,
+    "LonDivisor": 8000,
+    "PixelOffsetX": 13.875,
+    "PixelOffsetY": 21.125,
+    "PixelScaleX": 9.9125,
+    "PixelScaleY": 9.6875
+  },
+  {
+    "Filename": "Extinction",
+    "LatOffset": 50,
+    "LatDivisor": 8000,
+    "LonOffset": 50,
+    "LonDivisor": 8000,
+    "PixelOffsetX": 92.375,
+    "PixelOffsetY": 86.125,
+    "PixelScaleX": 8.4625,
+    "PixelScaleY": 8.2875
+  },
+  {
+    "Filename": "Valguero_P",
+    "LatOffset": 50,
+    "LatDivisor": 8161,
+    "LonOffset": 50,
+    "LonDivisor": 8161,
+    "PixelOffsetX": 17,
+    "PixelOffsetY": 14,
+    "PixelScaleX": 13.5,
+    "PixelScaleY": 13.5
+  }
 ]
\ No newline at end of file
diff --git a/LarkatorGUI/imgs/map_Valguero_P.jpg b/LarkatorGUI/imgs/map_Valguero_P.jpg
new file mode 100644
index 0000000..80aa4a7
Binary files /dev/null and b/LarkatorGUI/imgs/map_Valguero_P.jpg differ