More UI updates and cleanup

Application/MainWindow/CategoryList.cs

@@ -72,7 +72,7 @@ public partial class MainWindow
         // If the category changed then reset the current feed to the first in the category
         if (_currentCategory?.Id != category?.Id)
         {
-            _currentFeed = category == null ? _database.Feeds.FirstOrDefault() : category.Feeds.FirstOrDefault();
+            _currentFeed = category == null ? _database.Feeds.FirstOrDefault() : _database.Feeds.FirstOrDefault(f => f.CategoryId == category.Id);
         }
 
         // Set the current category

Application/MainWindow/MainWindow.xaml.cs

@@ -104,8 +104,6 @@ public partial class MainWindow : IDisposable
         HandleCommandLine(commandLine);
     }
 
-    #region Setting events
-
     private void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
     {
         // Make sure we're on the right thread
@@ -147,10 +145,6 @@ public partial class MainWindow : IDisposable
         }
     }
 
-    #endregion
-
-    #region Database helpers
-
     private void ResetDatabase()
     {
         // Get the ID of the current feed
@@ -191,10 +185,6 @@ public partial class MainWindow : IDisposable
             : _feedList.OrderBy(feed => feed.Name).AsEnumerable().ElementAt(_feedIndex);
     }
 
-    #endregion
-
-    #region Feed display
-
     private void UpdateToolbarButtonState()
     {
         // Cache the feed count to save (a little) time
@@ -429,6 +419,4 @@ public partial class MainWindow : IDisposable
         // Clear the list
         LinkTextList.Items.Clear();
     }
-
-    #endregion
 }