diff --git a/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml b/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml
index d0d0fe7..e917239 100644
--- a/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml
+++ b/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml
@@ -26,8 +26,7 @@
             <Image Name="CurrentTargetTitleImage"
                    Source="/OrbisLibraryManager;component/Images/DefaultTitleIcon.png"
                    RenderOptions.BitmapScalingMode="Fant"
-                   RenderOptions.EdgeMode="Aliased"
-                   MouseDown="CurrentTargetTitleImage_MouseDown"/>
+                   RenderOptions.EdgeMode="Aliased"/>
         </Border>
 
         <StackPanel Grid.Column="1" Grid.Row="1"
diff --git a/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml.cs b/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml.cs
index 904279a..d1e0553 100644
--- a/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml.cs
+++ b/Windows/OrbisLibraryManager/Controls/CurrentTargetDisplay.xaml.cs
@@ -75,41 +75,31 @@ namespace OrbisLibraryManager.Controls
 
                 CurrentTargetName.Text = CurrentTarget.IsDefault ? $"★{CurrentTarget.Name}" : CurrentTarget.Name;
 
-                if (CurrentTarget.Info.BigAppTitleID == null || !Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
+                try
+                {
+                    if (CurrentTarget.Info.BigAppTitleID == null || !Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
+                    {
+                        CurrentTargetTitleName.Text = "Unknown Title";
+                        CurrentTargetTitleId.Text = "-";
+                        CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisLibraryManager;component/Images/DefaultTitleIcon.png"));
+                    }
+                    else
+                    {
+                        var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
+                        CurrentTargetTitleName.Text = Title.Names.First();
+                        CurrentTargetTitleId.Text = Title.NPTitleID;
+                        CurrentTargetTitleImage.Source = new BitmapImage(new Uri(Title.Icons.First()));
+                    }
+                }
+                catch
                 {
                     CurrentTargetTitleName.Text = "Unknown Title";
                     CurrentTargetTitleId.Text = "-";
                     CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisLibraryManager;component/Images/DefaultTitleIcon.png"));
                 }
-                else
-                {
-                    var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
-                    Regex rgx = new Regex(@"[^0-9a-zA-Z +.:']");
-                    CurrentTargetTitleName.Text = Title.Names.First();
-                    CurrentTargetTitleId.Text = Title.NPTitleID;
-                    var test = Title.BGM;
-                    CurrentTargetTitleImage.Source = new BitmapImage(new Uri(Title.Icons.First()));
-                }
             }
         }
 
-        private void CurrentTargetTitleImage_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            var CurrentTarget = TargetManager.SelectedTarget;
-
-            if (CurrentTarget != null && CurrentTarget.Info.BigAppTitleID != null && Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
-            {
-                var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
-                var url = $"https://store.playstation.com/product/{Title.ContentID}/";
-
-                System.Diagnostics.Process.Start(new ProcessStartInfo
-                {
-                    FileName = url,
-                    UseShellExecute = true
-                });
-            }  
-        }
-
         private void CurrentTargetName_MouseDown(object sender, MouseButtonEventArgs e)
         {
             OrbisLib2.Dialog.SelectTarget.ShowDialog(Window.GetWindow(this));
diff --git a/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml b/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml
index 2c13192..225728f 100644
--- a/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml
+++ b/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml
@@ -26,8 +26,7 @@
             <Image Name="CurrentTargetTitleImage"
                    Source="/OrbisNeighborHood;component/Images/DefaultTitleIcon.png"
                    RenderOptions.BitmapScalingMode="Fant"
-                   RenderOptions.EdgeMode="Aliased"
-                   MouseDown="CurrentTargetTitleImage_MouseDown"/>
+                   RenderOptions.EdgeMode="Aliased"/>
         </Border>
 
         <StackPanel Grid.Column="1" Grid.Row="1"
diff --git a/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml.cs b/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml.cs
index 5953005..2ff9e19 100644
--- a/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml.cs
+++ b/Windows/OrbisNeighborHood/Controls/CurrentTargetDisplay.xaml.cs
@@ -75,41 +75,31 @@ namespace OrbisNeighborHood.Controls
 
                 CurrentTargetName.Text = CurrentTarget.IsDefault ? $"★{CurrentTarget.Name}" : CurrentTarget.Name;
 
-                if (CurrentTarget.Info.BigAppTitleID == null || !Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
+                try
+                {
+                    if (CurrentTarget.Info.BigAppTitleID == null || !Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
+                    {
+                        CurrentTargetTitleName.Text = "Unknown Title";
+                        CurrentTargetTitleId.Text = "-";
+                        CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisNeighborhood;component/Images/DefaultTitleIcon.png"));
+                    }
+                    else
+                    {
+                        var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
+                        CurrentTargetTitleName.Text = Title.Names.First();
+                        CurrentTargetTitleId.Text = Title.NPTitleID;
+                        CurrentTargetTitleImage.Source = new BitmapImage(new Uri(Title.Icons.First()));
+                    }
+                }
+                catch
                 {
                     CurrentTargetTitleName.Text = "Unknown Title";
                     CurrentTargetTitleId.Text = "-";
-                    CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisNeighborHood;component/Images/DefaultTitleIcon.png"));
-                }
-                else
-                {
-                    var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
-                    Regex rgx = new Regex(@"[^0-9a-zA-Z +.:']");
-                    CurrentTargetTitleName.Text = Title.Names.First();
-                    CurrentTargetTitleId.Text = Title.NPTitleID;
-                    var test = Title.BGM;
-                    CurrentTargetTitleImage.Source = new BitmapImage(new Uri(Title.Icons.First()));
+                    CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisNeighborhood;component/Images/DefaultTitleIcon.png"));
                 }
             }
         }
 
-        private void CurrentTargetTitleImage_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            var CurrentTarget = TargetManager.SelectedTarget;
-
-            if (CurrentTarget != null && CurrentTarget.Info.BigAppTitleID != null && Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
-            {
-                var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
-                var url = $"https://store.playstation.com/product/{Title.ContentID}/";
-
-                System.Diagnostics.Process.Start(new ProcessStartInfo
-                {
-                    FileName = url,
-                    UseShellExecute = true
-                });
-            }  
-        }
-
         private void CurrentTargetName_MouseDown(object sender, MouseButtonEventArgs e)
         {
             OrbisLib2.Dialog.SelectTarget.ShowDialog(Window.GetWindow(this));
diff --git a/Windows/OrbisNeighborHood/Resources/BuildNumber.txt b/Windows/OrbisNeighborHood/Resources/BuildNumber.txt
index 49d31a3..1217031 100644
--- a/Windows/OrbisNeighborHood/Resources/BuildNumber.txt
+++ b/Windows/OrbisNeighborHood/Resources/BuildNumber.txt
@@ -1 +1 @@
-2595
+2601
diff --git a/Windows/OrbisNeighborHood/Resources/BuildString.txt b/Windows/OrbisNeighborHood/Resources/BuildString.txt
index 8599884..f812b56 100644
--- a/Windows/OrbisNeighborHood/Resources/BuildString.txt
+++ b/Windows/OrbisNeighborHood/Resources/BuildString.txt
@@ -1 +1 @@
-Version 3.0.2595 Debug Build Tuesday February 14 2023 8:21 PM 
+Version 3.0.2601 Debug Build Tuesday February 14 2023 10:30 PM 
diff --git a/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml b/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml
index 4c4296b..add74b4 100644
--- a/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml
+++ b/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml
@@ -26,8 +26,7 @@
             <Image Name="CurrentTargetTitleImage"
                    Source="/OrbisPeeknPoke;component/Images/DefaultTitleIcon.png"
                    RenderOptions.BitmapScalingMode="Fant"
-                   RenderOptions.EdgeMode="Aliased"
-                   MouseDown="CurrentTargetTitleImage_MouseDown"/>
+                   RenderOptions.EdgeMode="Aliased"/>
         </Border>
 
         <StackPanel Grid.Column="1" Grid.Row="1"
diff --git a/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml.cs b/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml.cs
index f107d78..39afc30 100644
--- a/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml.cs
+++ b/Windows/OrbisPeeknPoke/Controls/CurrentTargetDisplay.xaml.cs
@@ -75,41 +75,31 @@ namespace OrbisPeeknPoke.Controls
 
                 CurrentTargetName.Text = CurrentTarget.IsDefault ? $"★{CurrentTarget.Name}" : CurrentTarget.Name;
 
-                if (CurrentTarget.Info.BigAppTitleID == null || !Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
+                try
+                {
+                    if (CurrentTarget.Info.BigAppTitleID == null || !Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
+                    {
+                        CurrentTargetTitleName.Text = "Unknown Title";
+                        CurrentTargetTitleId.Text = "-";
+                        CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisPeeknPoke;component/Images/DefaultTitleIcon.png"));
+                    }
+                    else
+                    {
+                        var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
+                        CurrentTargetTitleName.Text = Title.Names.First();
+                        CurrentTargetTitleId.Text = Title.NPTitleID;
+                        CurrentTargetTitleImage.Source = new BitmapImage(new Uri(Title.Icons.First()));
+                    }
+                }
+                catch
                 {
                     CurrentTargetTitleName.Text = "Unknown Title";
                     CurrentTargetTitleId.Text = "-";
                     CurrentTargetTitleImage.Source = new BitmapImage(new Uri("pack://application:,,,/OrbisPeeknPoke;component/Images/DefaultTitleIcon.png"));
                 }
-                else
-                {
-                    var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
-                    Regex rgx = new Regex(@"[^0-9a-zA-Z +.:']");
-                    CurrentTargetTitleName.Text = Title.Names.First();
-                    CurrentTargetTitleId.Text = Title.NPTitleID;
-                    var test = Title.BGM;
-                    CurrentTargetTitleImage.Source = new BitmapImage(new Uri(Title.Icons.First()));
-                }
             }
         }
 
-        private void CurrentTargetTitleImage_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            var CurrentTarget = TargetManager.SelectedTarget;
-
-            if (CurrentTarget != null && CurrentTarget.Info.BigAppTitleID != null && Regex.IsMatch(CurrentTarget.Info.BigAppTitleID, @"CUSA\d{5}"))
-            {
-                var Title = new TMDB(CurrentTarget.Info.BigAppTitleID);
-                var url = $"https://store.playstation.com/product/{Title.ContentID}/";
-
-                System.Diagnostics.Process.Start(new ProcessStartInfo
-                {
-                    FileName = url,
-                    UseShellExecute = true
-                });
-            }  
-        }
-
         private void CurrentTargetName_MouseDown(object sender, MouseButtonEventArgs e)
         {
             OrbisLib2.Dialog.SelectTarget.ShowDialog(Window.GetWindow(this));
diff --git a/Windows/OrbisPeeknPoke/OrbisPeeknPoke.xaml.cs b/Windows/OrbisPeeknPoke/OrbisPeeknPoke.xaml.cs
index f0917c9..fcb8ee5 100644
--- a/Windows/OrbisPeeknPoke/OrbisPeeknPoke.xaml.cs
+++ b/Windows/OrbisPeeknPoke/OrbisPeeknPoke.xaml.cs
@@ -48,25 +48,32 @@ namespace OrbisPeeknPoke
 
         private void HexBox_CurrentPositionInLineChanged(object? sender, EventArgs e)
         {
-            OffsetValue.Text = $"0x{(((HexBox.CurrentLine - 1) * 0x10) + (HexBox.CurrentPositionInLine - 1)).ToString("X")}";
+            if (HexBox.ByteProvider != null)
+                OffsetValue.Text = $"0x{(((HexBox.CurrentLine - 1) * 0x10) + (HexBox.CurrentPositionInLine - 1)).ToString("X")}";
+            else
+                OffsetValue.Text = string.Empty;
         }
 
         private void HexBox_CurrentLineChanged(object? sender, EventArgs e)
         {
-            OffsetValue.Text = $"0x{(((HexBox.CurrentLine - 1) * 0x10) + (HexBox.CurrentPositionInLine - 1)).ToString("X")}";
+            if (HexBox.ByteProvider != null)
+                OffsetValue.Text = $"0x{(((HexBox.CurrentLine - 1) * 0x10) + (HexBox.CurrentPositionInLine - 1)).ToString("X")}";
+            else
+                OffsetValue.Text = string.Empty;
         }
 
         #region Events
 
         private void EnableProgram(bool Attached)
         {
-            if (Attached)
+            SelectBase.IsEnabled = Attached;
+            Peek.IsEnabled = Attached;
+            Poke.IsEnabled = Attached;
+            HexBox.Enabled = Attached;
+
+            if (!Attached)
             {
-                // Try to load memory window.
-            }
-            else
-            {
-                // Clear memory window.
+                HexBox.ByteProvider = null;
             }
 
             DetachProcess.IsEnabled = Attached;