From 57a03293115a3d93c059a8c608da6cb571cfd75a Mon Sep 17 00:00:00 2001
From: brine <octgngamedirectory@gmail.com>
Date: Tue, 23 Apr 2024 18:05:32 -0400
Subject: [PATCH] Updated the game lobby tab layout +text cleanup (#2227)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* closes #2152 #2153 redesigned play/spectate tab + other text improvements

* added a dropshadow to the chat box to make the text easier to read on different coloured backgrounds

---------

Co-authored-by: Kelly Elton <its.the.doc@gmail.com>
---
 octgnFX/Octgn.Core/Prefs.cs                   |   6 -
 .../Controls/PreGameLobby.xaml                |  20 +-
 .../Networking/ClientHandler.cs               |   2 +-
 .../Play/Gui/ChatControl.xaml                 |   3 +
 .../Localization/ILanguageDictionary.cs       |   2 +-
 octgnFX/Octgn/App.xaml                        |   2 +
 octgnFX/Octgn/Octgn.csproj                    |   4 +
 .../Octgn/Resources/Themes/GridSplitter.xaml  |  36 +++
 .../Octgn/Tabs/Play/HostedGameViewModel.cs    | 242 ++++--------------
 octgnFX/Octgn/Tabs/Play/PlayTab.xaml          | 226 ++++++++--------
 octgnFX/Octgn/Tabs/Play/PlayTab.xaml.cs       | 115 +++++----
 octgnFX/Octgn/Windows/Main.xaml               |   2 +-
 recentchanges.txt                             |   3 +
 13 files changed, 291 insertions(+), 372 deletions(-)
 create mode 100644 octgnFX/Octgn/Resources/Themes/GridSplitter.xaml

diff --git a/octgnFX/Octgn.Core/Prefs.cs b/octgnFX/Octgn.Core/Prefs.cs
index 15bc3d1df7..ce7c224b14 100644
--- a/octgnFX/Octgn.Core/Prefs.cs
+++ b/octgnFX/Octgn.Core/Prefs.cs
@@ -587,12 +587,6 @@ public static int ContextFontSize
             set { Config.Instance.WriteValue("ContextFontSize", value); }
         }
 
-        public static bool SpectateGames
-        {
-            get { return Config.Instance.ReadValue("SpectateGames", false); }
-            set { Config.Instance.WriteValue("SpectateGames", value); }
-        }
-
         public static bool UnderstandsChat
         {
             get { return Config.Instance.ReadValue("UnderstandsChat", false); }
diff --git a/octgnFX/Octgn.JodsEngine/Controls/PreGameLobby.xaml b/octgnFX/Octgn.JodsEngine/Controls/PreGameLobby.xaml
index ecbd6e599f..c25b2c0f1f 100644
--- a/octgnFX/Octgn.JodsEngine/Controls/PreGameLobby.xaml
+++ b/octgnFX/Octgn.JodsEngine/Controls/PreGameLobby.xaml
@@ -109,12 +109,12 @@
                         <CheckBox.Template>
                             <ControlTemplate TargetType="CheckBox">
                                 <Border Padding="2" SnapsToDevicePixels="True" BorderBrush="#eee" BorderThickness="1" Background="Transparent">
-                                    <TextBlock x:Name="spectateLabel" Text="Play" TextAlignment="Center" Foreground="#eee" FontWeight="Bold" Width="54" />
+                                    <TextBlock x:Name="spectateLabel" Text="Player" TextAlignment="Center" Foreground="#eee" FontWeight="Bold" Width="58" />
                                 </Border>
                                 <ControlTemplate.Triggers>
                                     <Trigger Property="IsChecked" Value="True">
                                         <Trigger.Setters>
-                                            <Setter Property="Text" TargetName="spectateLabel" Value="Spectate" />
+                                            <Setter Property="Text" TargetName="spectateLabel" Value="Spectator" />
                                         </Trigger.Setters>
                                     </Trigger>
                                 </ControlTemplate.Triggers>
@@ -184,19 +184,25 @@
                             <toggleSwitch:HorizontalToggleSwitch Width="170" DataContext="{x:Static o:Program.GameSettings}" IsChecked="{Binding UseTwoSidedTable, Mode=TwoWay}" Visibility="{Binding ChangeTwoSidedTable, Converter={StaticResource BooleanToVisibilityConverter}}"
                                 IsEnabled="{Binding ElementName=me,Path=CanChangeSettings}">
                                 <toggleSwitch:HorizontalToggleSwitch.CheckedContent>
-                                    <TextBlock Text="Two Sided Table" TextWrapping="Wrap"></TextBlock>
+                                    <TextBlock Text="Two-Sided Table" TextWrapping="Wrap"></TextBlock>
                                 </toggleSwitch:HorizontalToggleSwitch.CheckedContent>
                                 <toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                                    <TextBlock Text="One Sided Table" TextWrapping="Wrap"></TextBlock>
+                                    <TextBlock Text="One-Sided Table" TextWrapping="Wrap"></TextBlock>
                                 </toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
+                                <toggleSwitch:HorizontalToggleSwitch.UncheckedBackground>
+                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                        <GradientStop Color="#FF3EB3EC"/>
+                                        <GradientStop Color="#FF349BE6" Offset="1"/>
+                                    </LinearGradientBrush>
+                                </toggleSwitch:HorizontalToggleSwitch.UncheckedBackground>
                             </toggleSwitch:HorizontalToggleSwitch>
-                            <toggleSwitch:HorizontalToggleSwitch Width="170" DataContext="{x:Static o:Program.GameSettings}" IsChecked="{Binding AllowSpectators, Mode=TwoWay}" Margin="10,0,0,0"
+                            <toggleSwitch:HorizontalToggleSwitch Width="190" DataContext="{x:Static o:Program.GameSettings}" IsChecked="{Binding AllowSpectators, Mode=TwoWay}" Margin="10,0,0,0"
                                 IsEnabled="{Binding ElementName=me,Path=CanChangeSettings}">
                                 <toggleSwitch:HorizontalToggleSwitch.CheckedContent>
                                     <TextBlock Text="Allow Spectators" TextWrapping="Wrap"></TextBlock>
                                 </toggleSwitch:HorizontalToggleSwitch.CheckedContent>
                                 <toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                                    <TextBlock Text="No Spectators" TextWrapping="Wrap"></TextBlock>
+                                    <TextBlock Text="Disable Spectators" TextWrapping="Wrap"></TextBlock>
                                 </toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
                             </toggleSwitch:HorizontalToggleSwitch>
                             <toggleSwitch:HorizontalToggleSwitch Width="170" DataContext="{x:Static o:Program.GameSettings}" IsChecked="{Binding AllowCardList, Mode=TwoWay}" Margin="10,0,0,0"
@@ -205,7 +211,7 @@
                                     <TextBlock Text="Allow Card List" TextWrapping="Wrap"></TextBlock>
                                 </toggleSwitch:HorizontalToggleSwitch.CheckedContent>
                                 <toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                                    <TextBlock Text="Hidden Card List" TextWrapping="Wrap"></TextBlock>
+                                    <TextBlock Text="Disable Card List" TextWrapping="Wrap"></TextBlock>
                                 </toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
                             </toggleSwitch:HorizontalToggleSwitch>
                             <toggleSwitch:HorizontalToggleSwitch Width="190" DataContext="{x:Static o:Program.GameSettings}" IsChecked="{Binding AllowDiscordGameInvite, Mode=TwoWay}" Margin="10,0,0,0"
diff --git a/octgnFX/Octgn.JodsEngine/Networking/ClientHandler.cs b/octgnFX/Octgn.JodsEngine/Networking/ClientHandler.cs
index 2e754d5928..3151d9484d 100644
--- a/octgnFX/Octgn.JodsEngine/Networking/ClientHandler.cs
+++ b/octgnFX/Octgn.JodsEngine/Networking/ClientHandler.cs
@@ -482,7 +482,7 @@ public void CreateCardAt(int[] id, Guid[] modelId, int[] x, int[] y, bool faceUp
         public void Leave(Player player)
         {
             WriteReplayAction(player.Id);
-            Program.GameMess.System("{0} has closed their game window left the game. They did not crash or lose connection, they left on purpose.", player);
+            Program.GameMess.System("{0} has voluntarily left the game.", player);
             if( !Program.InPreGame ) {
                 Program.GameEngine.EventProxy.OnPlayerLeaveGame_3_1_0_1( player );
                 Program.GameEngine.EventProxy.OnPlayerQuit_3_1_0_2( player );
diff --git a/octgnFX/Octgn.JodsEngine/Play/Gui/ChatControl.xaml b/octgnFX/Octgn.JodsEngine/Play/Gui/ChatControl.xaml
index 18a9e9c145..52ab37861f 100644
--- a/octgnFX/Octgn.JodsEngine/Play/Gui/ChatControl.xaml
+++ b/octgnFX/Octgn.JodsEngine/Play/Gui/ChatControl.xaml
@@ -27,6 +27,9 @@
 
             <RichTextBox x:Name="output" AutomationProperties.Name="Chat/Game Log" IsReadOnly="True" ScrollViewer.VerticalScrollBarVisibility="Visible"
                    BorderThickness="0" Background="Transparent" Grid.Row="1" FontSize="{Binding ElementName=Me, Path=ChatFontSize}">
+                <RichTextBox.Effect>
+                    <DropShadowEffect ShadowDepth="1" Direction="315" Color="Black" Opacity="0.5" BlurRadius="1"/>
+                </RichTextBox.Effect>
                 <RichTextBox.Resources>
                     <Style TargetType="{x:Type Paragraph}">
                         <Setter Property="Margin" Value="0"/>
diff --git a/octgnFX/Octgn.Library/Localization/ILanguageDictionary.cs b/octgnFX/Octgn.Library/Localization/ILanguageDictionary.cs
index aa32cad633..c5e9f2f2c2 100644
--- a/octgnFX/Octgn.Library/Localization/ILanguageDictionary.cs
+++ b/octgnFX/Octgn.Library/Localization/ILanguageDictionary.cs
@@ -299,7 +299,7 @@ public string UpdateMessage__UpdatingGame_Format
 
         public string LoginMessage__UnknownError => "An unknown error occured. Please try again.";
 
-        public string ConnectionStatus__Disconnected => "Offline";
+        public string ConnectionStatus__Disconnected => "Not Logged In";
 
         public string ConnectionStatus__Connecting => "Connecting...";
 
diff --git a/octgnFX/Octgn/App.xaml b/octgnFX/Octgn/App.xaml
index 897b167026..ec23036d99 100644
--- a/octgnFX/Octgn/App.xaml
+++ b/octgnFX/Octgn/App.xaml
@@ -8,6 +8,8 @@
         </ResourceDictionary>
         <ResourceDictionary Source="/Resources/Themes/Global.xaml">
         </ResourceDictionary>
+        <ResourceDictionary Source="/Resources/Themes/GridSplitter.xaml">
+        </ResourceDictionary>
         <ResourceDictionary Source="/Resources/Themes/NumericUpDown.xaml">
         </ResourceDictionary>
         <ResourceDictionary Source="/Resources/Themes/ChildWindow.xaml">
diff --git a/octgnFX/Octgn/Octgn.csproj b/octgnFX/Octgn/Octgn.csproj
index 749ac6fd80..5edda1c787 100644
--- a/octgnFX/Octgn/Octgn.csproj
+++ b/octgnFX/Octgn/Octgn.csproj
@@ -664,6 +664,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Resources\Themes\GridSplitter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Tabs\GameHistory\GameHistoryTab.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/octgnFX/Octgn/Resources/Themes/GridSplitter.xaml b/octgnFX/Octgn/Resources/Themes/GridSplitter.xaml
new file mode 100644
index 0000000000..3b55d527dc
--- /dev/null
+++ b/octgnFX/Octgn/Resources/Themes/GridSplitter.xaml
@@ -0,0 +1,36 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ctrl="clr-namespace:Octgn.Controls">
+    <Style x:Key="HorizontalGridSplitter" TargetType="{x:Type GridSplitter}">
+        <Setter Property="ResizeDirection" Value="Rows"/>
+        <Setter Property="HorizontalAlignment" Value="Center"/>
+        <Setter Property="VerticalAlignment" Value="Center"/>
+        <Setter Property="BorderBrush" Value="WhiteSmoke"/>
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Margin" Value="1" />
+        <Setter Property="Background" Value="{StaticResource ControlBackgroundBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridSplitter}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        Background="{TemplateBinding Background}"
+                                        Padding="9,2,9,1"
+                                        CornerRadius="5">
+                        <Canvas RenderOptions.EdgeMode="Aliased" UseLayoutRounding="True"
+                                Height="6" VerticalAlignment="Center"
+                                Width="50" HorizontalAlignment="Center">
+                            <Line X1="0" X2="50" Y1="0" Y2="0"
+                                  Stroke="WhiteSmoke" StrokeThickness="1"/>
+                            <Line X1="0" X2="50" Y1="1" Y2="1"
+                                  Stroke="#A0A0A0" StrokeThickness="1"/>
+                            <Line X1="0" X2="50" Y1="4" Y2="4"
+                                  Stroke="WhiteSmoke" StrokeThickness="1"/>
+                            <Line X1="0" X2="50" Y1="5" Y2="5"
+                                  Stroke="#A0A0A0" StrokeThickness="1"/>
+                        </Canvas>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/octgnFX/Octgn/Tabs/Play/HostedGameViewModel.cs b/octgnFX/Octgn/Tabs/Play/HostedGameViewModel.cs
index 32cac5fe11..07c722a50f 100644
--- a/octgnFX/Octgn/Tabs/Play/HostedGameViewModel.cs
+++ b/octgnFX/Octgn/Tabs/Play/HostedGameViewModel.cs
@@ -18,40 +18,27 @@ public class HostedGameViewModel : INotifyPropertyChanged
         private static log4net.ILog Log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         private Guid gameId;
-
         private string gameName;
-
         private Version gameVersion;
-
         private string name;
-
         private string userName;
-
         private int port;
-
         private HostedGameStatus status;
-
         private DateTime startTime;
-
         private bool canPlay;
-
         private bool _spectator;
-
         private bool hasPassword;
         private IPAddress _ipAddress;
         private string _gameSource;
         private ImageSource _userImage;
-
         private Guid id;
 
         public Guid GameId
         {
-            get
-            {
-                return this.gameId;
-            }
+            get { return this.gameId; }
             private set
             {
+                if (value.Equals(this.gameId)) return;
                 this.gameId = value;
                 this.OnPropertyChanged("GameId");
             }
@@ -59,16 +46,9 @@ private set
 
         public string GameName
         {
-            get
-            {
-                return this.gameName;
-            }
-            private set
-            {
-                if (value == this.gameName)
-                {
-                    return;
-                }
+            get { return this.gameName; }
+            private set {
+                if (value.Equals(this.gameName)) return;
                 this.gameName = value;
                 this.OnPropertyChanged("GameName");
             }
@@ -76,16 +56,9 @@ private set
 
         public Version GameVersion
         {
-            get
-            {
-                return this.gameVersion;
-            }
-            private set
-            {
-                if (Equals(value, this.gameVersion))
-                {
-                    return;
-                }
+            get { return this.gameVersion; }
+            private set {
+                if (Equals(value, this.gameVersion)) return;
                 this.gameVersion = value;
                 this.OnPropertyChanged("GameVersion");
             }
@@ -93,16 +66,9 @@ private set
 
         public string Name
         {
-            get
-            {
-                return this.name;
-            }
-            private set
-            {
-                if (value == this.name)
-                {
-                    return;
-                }
+            get { return this.name; }
+            private set {
+                if (Equals(value, this.name)) return;
                 this.name = value;
                 this.OnPropertyChanged("Name");
             }
@@ -110,26 +76,19 @@ private set
 
         public string UserName
         {
-            get
-            {
-                return this.userName;
-            }
-            private set
-            {
-                if (Equals(value, this.userName))
-                {
-                    return;
-                }
+            get { return this.userName; }
+            private set {
+                if (Equals(value, this.userName)) return;
                 this.userName = value;
                 this.OnPropertyChanged(nameof(UserName));
             }
         }
 
         public string UserId {
-            get => userId;
+            get { return this.userId; }
             set {
-                if (userId == value) return;
-                userId = value;
+                if (value.Equals(this.userId)) return;
+                this.userId = value;
                 OnPropertyChanged(nameof(UserId));
             }
         }
@@ -138,16 +97,9 @@ public string UserId {
 
         public int Port
         {
-            get
-            {
-                return this.port;
-            }
-            private set
-            {
-                if (value == this.port)
-                {
-                    return;
-                }
+            get { return this.port; }
+            private set {
+                if (value.Equals(this.port)) return;
                 this.port = value;
                 this.OnPropertyChanged("Port");
             }
@@ -155,16 +107,9 @@ private set
 
         public HostedGameStatus Status
         {
-            get
-            {
-                return this.status;
-            }
-            private set
-            {
-                if (value == this.status)
-                {
-                    return;
-                }
+            get { return this.status; }
+            private set {
+                if (Equals(value, this.status)) return;
                 this.status = value;
                 this.OnPropertyChanged("Status");
             }
@@ -172,16 +117,9 @@ private set
 
         public DateTime StartTime
         {
-            get
-            {
-                return this.startTime;
-            }
-            private set
-            {
-                if (value.Equals(this.startTime))
-                {
-                    return;
-                }
+            get { return this.startTime; }
+            private set {
+                if (Equals(value, this.startTime)) return;
                 this.startTime = value;
                 this.OnPropertyChanged("StartTime");
             }
@@ -189,16 +127,10 @@ private set
 
         public string RunTime
         {
-            get
-            {
-                return this.runTime;
-            }
+            get { return this.runTime; }
             set
             {
-                if (value.Equals(this.runTime))
-                {
-                    return;
-                }
+                if (Equals(value, this.runTime)) return;
                 this.runTime = value;
                 this.OnPropertyChanged("RunTime");
             }
@@ -206,16 +138,10 @@ public string RunTime
 
         public bool CanPlay
         {
-            get
-            {
-                return this.canPlay;
-            }
+            get { return this.canPlay; }
             private set
             {
-                if (value.Equals(this.canPlay))
-                {
-                    return;
-                }
+                if (Equals(value, this.canPlay)) return;
                 this.canPlay = value;
                 this.OnPropertyChanged("CanPlay");
             }
@@ -223,16 +149,10 @@ private set
 
         public bool HasPassword
         {
-            get
-            {
-                return this.hasPassword;
-            }
+            get { return this.hasPassword; }
             set
             {
-                if (value.Equals(this.hasPassword))
-                {
-                    return;
-                }
+                if (Equals(value, this.hasPassword)) return;
                 this.hasPassword = value;
                 this.OnPropertyChanged("HasPassword");
             }
@@ -241,10 +161,8 @@ public bool HasPassword
         public IPAddress IPAddress
         {
             get { return _ipAddress; }
-            set
-            {
-                if (value.Equals(_ipAddress))
-                    return;
+            set {
+                if (value.Equals(_ipAddress)) return;
                 _ipAddress = value;
                 this.OnPropertyChanged("IPAddress");
             }
@@ -253,8 +171,7 @@ public IPAddress IPAddress
         public string GameSource
         {
             get { return _gameSource; }
-            set
-            {
+            set {
                 if (value.Equals(_gameSource)) return;
                 _gameSource = value;
                 this.OnPropertyChanged("GameSource");
@@ -264,10 +181,8 @@ public string GameSource
         public ImageSource UserImage
         {
             get { return _userImage; }
-            set
-            {
-                if (value.Equals(_userImage))
-                    return;
+            set {
+                if (value.Equals(_userImage)) return;
                 _userImage = value;
                 OnPropertyChanged("UserImage");
             }
@@ -275,36 +190,20 @@ public ImageSource UserImage
 
         public Guid Id
         {
-            get
-            {
-                return this.id;
-            }
-            set
-            {
-                if (value == this.Id) return;
+            get { return this.id; }
+            set {
+                if (Equals(value, this.id)) return;
                 this.id = value;
                 OnPropertyChanged("Id");
             }
         }
 
-        public bool Visible
-        {
-            get { return _visible; }
-            set
-            {
-                if (value == this._visible) return;
-                _visible = value;
-                OnPropertyChanged("Visible");
-            }
-        }
-
         public bool Spectator
         {
             get { return _spectator; }
-            set
-            {
-                if (value == this._spectator) return;
-                _spectator = value;
+            set {
+                if (Equals(value, this._spectator)) return;
+                this._spectator = value;
                 OnPropertyChanged("Spectator");
             }
         }
@@ -330,9 +229,7 @@ public HostedGameViewModel(HostedGame game)
             this.StartTime = game.DateCreated.LocalDateTime;
             this.GameName = game.GameName;
             this.HasPassword = game.HasPassword;
-            this.Visible = true;
             this.Spectator = game.Spectators;
-            UpdateVisibility();
             switch (game.Source)
             {
                 case HostedGameSource.Online:
@@ -347,7 +244,7 @@ public HostedGameViewModel(HostedGame game)
             this.GameName = gameManagerGame.Name;
 
             try {
-                if(IPAddress.TryParse(game.Host, out IPAddress address)) {
+                if (IPAddress.TryParse(game.Host, out IPAddress address)) {
                     IPAddress = address;
                 } else {
                     this.IPAddress = Dns.GetHostAddresses(game.Host)
@@ -365,49 +262,6 @@ public HostedGameViewModel()
         private string previousIconUrl = "";
 
         private string runTime;
-        private bool _visible;
-
-        public void UpdateVisibility()
-        {
-            if (Prefs.HideUninstalledGamesInList)
-            {
-                if (this.CanPlay == false)
-                {
-                    Visible = false;
-                    return;
-                }
-            }
-            if (Prefs.SpectateGames)
-            {
-                if (this.Status == HostedGameStatus.StartedHosting)
-                {
-                    Visible = false;
-                    return;
-                }
-                if (this.Spectator)
-                {
-                    Visible = true;
-                    return;
-                }
-                Visible = false;
-                return;
-            }
-            else
-            {
-                if (this.Status == HostedGameStatus.StartedHosting)
-                {
-                    Visible = true;
-                    return;
-                }
-                if (this.Status == HostedGameStatus.GameInProgress)
-                {
-                    Visible = false;
-                    return;
-                }
-                Visible = false;
-                return;
-            }
-        }
 
         public void Update(HostedGameViewModel newer, Game[] games)
         {
@@ -437,13 +291,7 @@ public void Update(HostedGameViewModel newer, Game[] games)
             {
                 Status = newer.Status;
             }
-            UpdateVisibility();
-            if (game == null)
-            {
-                this.CanPlay = false;
-                return;
-            }
-            this.CanPlay = true;
+            this.CanPlay = game != null;
 
         }
 
diff --git a/octgnFX/Octgn/Tabs/Play/PlayTab.xaml b/octgnFX/Octgn/Tabs/Play/PlayTab.xaml
index 48b501e627..628068ca1a 100644
--- a/octgnFX/Octgn/Tabs/Play/PlayTab.xaml
+++ b/octgnFX/Octgn/Tabs/Play/PlayTab.xaml
@@ -3,67 +3,43 @@
              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:controls="clr-namespace:Octgn.Controls"
              xmlns:utils="clr-namespace:Octgn.Utils"
              xmlns:local="clr-namespace:Octgn.Tabs.Play"
-             xmlns:toggleSwitch="clr-namespace:ToggleSwitch;assembly=ToggleSwitch"
              mc:Ignorable="d"
              d:DesignHeight="600" d:DesignWidth="870"
              x:Name="Me">
     <UserControl.Resources>
-        <Style x:Key="ListViewItemStyle" TargetType="{x:Type ListViewItem}"
-               BasedOn="{StaticResource {x:Type ListViewItem}}">
-            <EventSetter Event="MouseDoubleClick" Handler="GameListItemDoubleClick"/>
-            <Setter Property="Visibility" Value="{Binding Path=Visible,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-        </Style>
-        <Style x:Key="{x:Type toggleSwitch:HorizontalToggleSwitch}" TargetType="{x:Type toggleSwitch:HorizontalToggleSwitch}">
-            <Setter Property="Background" Value="#FF1F1F1F"/>
-            <Setter Property="Height" Value="30"/>
-            <Setter Property="UncheckedBackground" Value="#FF333430"/>
-            <Setter Property="UncheckedForeground" Value="#FF999999"/>
-            <Setter Property="ThumbSize" Value="38"/>
-            <Setter Property="Margin" Value="5 0 0 0"/>
-            <Setter Property="CheckedBackground">
-                <Setter.Value>
-                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                        <GradientStop Color="#FF3EB3EC"/>
-                        <GradientStop Color="#FF349BE6" Offset="1"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="ThumbBrush">
-                <Setter.Value>
-                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                        <GradientStop Color="#FF4D4E48"/>
-                        <GradientStop Color="#FF333430" Offset="1"/>
-                        <GradientStop Color="#FF333330" Offset="0.021"/>
-                    </LinearGradientBrush>
-                </Setter.Value>
-            </Setter>
-        </Style>
+        <DataTemplate x:Key="IconTemplate">
+                <Image Source="/OCTGN;component/Resources/lock.png"
+                           Stretch="UniformToFill"
+                           Height="16"
+                           Visibility="{Binding Path=HasPassword,Converter={StaticResource BooleanToVisibilityConverter}}"/>
+            </DataTemplate>
+        <DataTemplate x:Key="UserIconTemplate">
+            <Image Source="{Binding Path=UserImage}"
+                           Stretch="UniformToFill"
+                           Height="16" Width="16" Margin="0"/>
+        </DataTemplate>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
-            <RowDefinition Height="497*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition MinHeight="100" Height="*"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition MinHeight="100" Height="2*" />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="100*"/>
-            <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
-        <Border x:Name="DialogPlaceHolder" Grid.RowSpan="3" Grid.ColumnSpan="2" Panel.ZIndex="10" Margin="0 -34 0 0"></Border>
-        <Border x:Name="BorderButtons" Style="{StaticResource ButtonBarPanel}" IsEnabled="{Binding LoadingGame, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}" Grid.Row="0" Grid.Column="0">
+        <Border x:Name="DialogPlaceHolder" Grid.RowSpan="8" Panel.ZIndex="10" Margin="0 -34 0 0"></Border>
+        <Border x:Name="BorderButtons" Style="{StaticResource ButtonBarPanel}" IsEnabled="{Binding LoadingGame, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}" Grid.Row="0">
             <DockPanel>
                 <Border DockPanel.Dock="Right" Height="35">
                     <Border Padding="5,0,5,0" CornerRadius="5" Background="#dd333333" Visibility="Visible">
                         <Grid Margin="10 1 10 5">
                             <Label HorizontalAlignment="Center" FontSize="8"
-                                   Content="{Binding GameCount, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}"
-                                   />
-                            <Label Content="Games" FontSize="12"
-                                   FontWeight="Bold"
-                                   Margin="0 15 0 0"/>
+                                   Content="{Binding GameCount, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}" />
+                            <Label Content="Games" FontSize="12" FontWeight="Bold" Margin="0 15 0 0"/>
                         </Grid>
                     </Border>
                 </Border>
@@ -71,36 +47,25 @@
                     <!--<Button Click="ButtonRefreshClick" Width="35" Height="30" Margin="0,0,5,0" FontSize="35" Padding="0 -6 0 0"
                         Style="{StaticResource FlatDarkOrangeButtonStyle}" x:Name="ButtonRefresh"
                         FontFamily="{StaticResource Entypo}" ToolTip="Refresh Game List">&#10227;</Button>-->
-                    <Button Click="ButtonHostClick" Content="Start" MinWidth="80" Height="34" Margin="0,0,5,0" Style="{StaticResource FlatDarkGreenButtonStyle}"></Button>
-                    <Button Click="ButtonJoinClick" Content="Join" MinWidth="80" Height="34" Margin="0,0,5,0" Style="{StaticResource FlatDarkButtonStyle}"
+                    <Button Click="ButtonHostClick" Content="Host Game" MinWidth="80" Height="34" Margin="0,0,5,0" Style="{StaticResource FlatDarkGreenButtonStyle}"></Button>
+                    <Button Click="ButtonJoinClick" Content="Join Game" MinWidth="80" Height="34" Margin="0,0,5,0" Style="{StaticResource FlatDarkButtonStyle}"
                         IsEnabled="{Binding IsJoinableGameSelected, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}"/>
-                    <Button Click="ButtonJoinOfflineGame" Content="Join Unlisted" MinWidth="80" Padding="5,0"
-                        Height="34" Margin="0,0,0,0" Style="{StaticResource FlatDarkButtonStyle}"></Button>
-                    <toggleSwitch:HorizontalToggleSwitch Width="220" Height="34" IsChecked="{Binding ElementName=Me,Path=ShowUninstalledGames, Mode=TwoWay,NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}">
-                        <toggleSwitch:HorizontalToggleSwitch.CheckedContent>
-                            <TextBlock Text="Show Uninstalled Games" TextWrapping="Wrap"></TextBlock>
-                        </toggleSwitch:HorizontalToggleSwitch.CheckedContent>
-                        <toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                            <TextBlock Text="Hide Uninstalled Games" TextWrapping="Wrap"></TextBlock>
-                        </toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                    </toggleSwitch:HorizontalToggleSwitch>
-                    <toggleSwitch:HorizontalToggleSwitch Width="200" Height="34" IsChecked="{Binding ElementName=Me,Path=Spectate, Mode=TwoWay}">
-                        <toggleSwitch:HorizontalToggleSwitch.CheckedContent>
-                            <TextBlock Text="Spectate" TextWrapping="Wrap"></TextBlock>
-                        </toggleSwitch:HorizontalToggleSwitch.CheckedContent>
-                        <toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                            <TextBlock Text="Play" TextWrapping="Wrap"></TextBlock>
-                        </toggleSwitch:HorizontalToggleSwitch.UncheckedContent>
-                    </toggleSwitch:HorizontalToggleSwitch>
-                    <Grid Width="6"></Grid>
+                    <Button Click="ButtonJoinOfflineGame" Content="Connect To A Game" MinWidth="80" Padding="5,0"
+                        Height="34" Margin="0,0,5,0" Style="{StaticResource FlatDarkButtonStyle}" />
                     <Button Click="ButtonKillGame" Content="Kill Game" MinWidth="80" Padding="5,0"
-                        Height="30" Margin="0,0,0,0" Style="{StaticResource FlatDarkRedButtonStyle}"
+                        Height="34" Margin="0,0,5,0" Style="{StaticResource FlatDarkRedButtonStyle}"
                         Visibility="{Binding ElementName=Me,Path=ShowKillGameButton,Converter={StaticResource BooleanToVisibilityConverter}}"
-                        />
+                            />
+
+                    <CheckBox VerticalAlignment="Center" IsChecked="{Binding ElementName=Me, Path=HideUninstalledGames}" Margin="10 0 5 0">
+                        <CheckBox.Content>
+                            <TextBlock Text="Only Show Installed Games" Style="{StaticResource PanelText}"  />
+                        </CheckBox.Content>
+                    </CheckBox>
                 </WrapPanel>
             </DockPanel>
         </Border>
-        <ProgressBar Grid.Row="1" Grid.Column="0" Height="4" IsIndeterminate="{Binding ElementName=Me,Path=IsRefreshingGameList}" Maximum="200" Minimum="0" Foreground="CornflowerBlue">
+        <ProgressBar Grid.Row="1" Height="4" IsIndeterminate="{Binding ElementName=Me,Path=IsRefreshingGameList}" Maximum="200" Minimum="0" Foreground="CornflowerBlue">
             <ProgressBar.Style>
                 <Style TargetType="{x:Type ProgressBar}">
                     <Style.Resources>
@@ -142,28 +107,42 @@
                 </Style>
             </ProgressBar.Style>
         </ProgressBar>
-        <ListView x:Name="ListViewGameList" Grid.Row="2"
-                  SelectionChanged="ListViewGameListSelectionChanged"
-                  ItemsSource="{Binding HostedGameList, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}"
-                  ItemContainerStyle="{StaticResource ListViewItemStyle}"
-                  IsSynchronizedWithCurrentItem="True"
-                  utils:GridViewSort.AutoSort="True"
-                  Grid.RowSpan="3"
+
+        <Border Style="{StaticResource ButtonBarPanel}" Grid.Row="2" Visibility="{Binding ElementName=Me, Path=IsLoggedIn, Converter={StaticResource InvertedBooleanToVisibilityConverter}}" >
+            <TextBlock Style="{StaticResource PanelText}" Foreground="GreenYellow"
+                   Text="You are not logged in to OCTGN.  Only games hosted on your Local Area Network (LAN) will be listed here.  Log in to view games hosted online." />
+        </Border>
+        <TextBlock Grid.Row="3" Text="Games Awaiting Players (join to play): " Style="{StaticResource PanelText}" Margin="2" />
+        <ListView x:Name="HostingGamesList" Grid.Row="4"
+                  SelectedValue="{Binding ElementName=Me, Path=SelectedGame}"
+                  Background="#aa333333"
+                  AlternationCount="1"
                   SelectionMode="Single"
-                  AlternationCount="1">
-            <ListView.Resources>
-                <DataTemplate x:Key="IconTemplate">
-                    <Image Source="/OCTGN;component/Resources/lock.png"
-                           Stretch="UniformToFill"
-                           Height="16"
-                           Visibility="{Binding Path=HasPassword,Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                </DataTemplate>
-                <DataTemplate x:Key="UserIconTemplate">
-                    <Image Source="{Binding Path=UserImage}"
-                           Stretch="UniformToFill"
-                           Height="16" Width="16" Margin="0"/>
-                </DataTemplate>
-            </ListView.Resources>
+                  utils:GridViewSort.AutoSort="True"
+                  ItemsSource="{Binding HostedGameList, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}" >
+            <ListView.ItemContainerStyle>
+                <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
+                    <Setter Property="Visibility" Value="Visible" />
+                    <EventSetter Event="MouseDoubleClick" Handler="GameListItemDoubleClick"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Status}" Value="GameInProgress">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Status}" Value="StoppedHosting">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </DataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding CanPlay}" Value="False" />
+                                <Condition Binding="{Binding ElementName=Me, Path=HideUninstalledGames}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.Setters>
+                                <Setter Property="Visibility" Value="Collapsed" />
+                            </MultiDataTrigger.Setters>
+                        </MultiDataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </ListView.ItemContainerStyle>
             <ListView.View>
                 <GridView>
                     <GridViewColumn CellTemplate="{StaticResource UserIconTemplate}" Width="35"></GridViewColumn>
@@ -177,23 +156,68 @@
                     <GridViewColumn Header="Name"
                                     utils:GridViewSort.PropertyName="Name"
                                     DisplayMemberBinding="{Binding Path=Name}" Width="300"></GridViewColumn>
-                    <!--<GridViewColumn Header="Status"
-                                    utils:GridViewSort.PropertyName="Status"
-                                    DisplayMemberBinding="{Binding Path=Status}" Width="100"></GridViewColumn>-->
-                    <!--<GridViewColumn Header="Source"
-                                    utils:GridViewSort.PropertyName="Source"
-                                    DisplayMemberBinding="{Binding Path=GameSource}" Width="50"></GridViewColumn>-->
-                    <!--<GridViewColumn Header="Version"
-                                    utils:GridViewSort.PropertyName="GameVersion"
-                                    DisplayMemberBinding="{Binding Path=GameVersion}" Width="75"></GridViewColumn>-->
-                    <!--<GridViewColumn Header="StartTime"
+                    <GridViewColumn Header="RunTime"
                                     utils:GridViewSort.PropertyName="StartTime"
-                                    DisplayMemberBinding="{Binding Path=StartTime}"></GridViewColumn>-->
+                                    DisplayMemberBinding="{Binding Path=RunTime}" Width="70"></GridViewColumn>
+                    <GridViewColumn Header="Source"
+                                    utils:GridViewSort.PropertyName="Source"
+                                    DisplayMemberBinding="{Binding Path=GameSource}" Width="50"></GridViewColumn>
+                </GridView>
+            </ListView.View>
+        </ListView>
+        <TextBlock Grid.Row="5" Text="Games in Progress (join to spectate): " Style="{StaticResource PanelText}" Margin="2" />
+        <GridSplitter Style="{StaticResource HorizontalGridSplitter}" Grid.Row="5" VerticalAlignment="Top"  ResizeDirection="Rows"  ResizeBehavior="PreviousAndNext"/>
+        <ListView x:Name="SpectatingGamesList" Grid.Row="6"
+                  SelectedValue="{Binding ElementName=Me, Path=SelectedGame}"
+                  Background="#aa333333"
+                  AlternationCount="1"
+                  SelectionMode="Single"
+                  utils:GridViewSort.AutoSort="True"
+                  ItemsSource="{Binding HostedGameList, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PlayTab}}}" >
+            <ListView.View>
+                <GridView>
+                    <GridViewColumn CellTemplate="{StaticResource UserIconTemplate}" Width="35"></GridViewColumn>
+                    <GridViewColumn CellTemplate="{StaticResource IconTemplate}" Width="25"></GridViewColumn>
+                    <GridViewColumn Header="User"
+                                    utils:GridViewSort.PropertyName="UserName"
+                                    DisplayMemberBinding="{Binding Path=UserName}" Width="100"></GridViewColumn>
+                    <GridViewColumn Header="Game"
+                                    utils:GridViewSort.PropertyName="GameName"
+                                    DisplayMemberBinding="{Binding Path=GameName}" Width="220"></GridViewColumn>
+                    <GridViewColumn Header="Name"
+                                    utils:GridViewSort.PropertyName="Name"
+                                    DisplayMemberBinding="{Binding Path=Name}" Width="300"></GridViewColumn>
                     <GridViewColumn Header="RunTime"
                                     utils:GridViewSort.PropertyName="StartTime"
-                                    DisplayMemberBinding="{Binding Path=RunTime}" Width="100"></GridViewColumn>
+                                    DisplayMemberBinding="{Binding Path=RunTime}" Width="70"></GridViewColumn>
+                    <GridViewColumn Header="Source"
+                                    utils:GridViewSort.PropertyName="Source"
+                                    DisplayMemberBinding="{Binding Path=GameSource}" Width="50"></GridViewColumn>
                 </GridView>
             </ListView.View>
+            <ListView.ItemContainerStyle>
+                <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
+                    <Setter Property="Visibility" Value="Visible" />
+                    <EventSetter Event="MouseDoubleClick" Handler="GameListItemDoubleClick"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Status}" Value="StartedHosting">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Status}" Value="StoppedHosting">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </DataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding CanPlay}" Value="False" />
+                                <Condition Binding="{Binding ElementName=Me, Path=HideUninstalledGames}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.Setters>
+                                <Setter Property="Visibility" Value="Collapsed" />
+                            </MultiDataTrigger.Setters>
+                        </MultiDataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </ListView.ItemContainerStyle>
         </ListView>
         <!--<TextBlock x:Name="RefreshMessage" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center"
                    Foreground="White" Background="{x:Null}" FontSize="20">
diff --git a/octgnFX/Octgn/Tabs/Play/PlayTab.xaml.cs b/octgnFX/Octgn/Tabs/Play/PlayTab.xaml.cs
index c0bd4272ab..a6603f6135 100644
--- a/octgnFX/Octgn/Tabs/Play/PlayTab.xaml.cs
+++ b/octgnFX/Octgn/Tabs/Play/PlayTab.xaml.cs
@@ -34,85 +34,84 @@ public partial class PlayTab : INotifyPropertyChanged, IDisposable
 
         public ObservableCollection<HostedGameViewModel> HostedGameList { get; set; }
 
+        private bool _loadingGame;
         public bool LoadingGame
         {
             get => _loadingGame;
             set => NotifyAndUpdate(ref _loadingGame, value);
         }
 
-        public bool Spectate {
-            get => _spectate;
+        private HostedGameViewModel _selectedGame;
+        public HostedGameViewModel SelectedGame
+        {
+            get { return _selectedGame; }
+
             set {
-                if (NotifyAndUpdate(ref _spectate, value)) {
-                    Prefs.SpectateGames = _spectate;
-                    foreach (var g in HostedGameList.ToArray()) {
-                        g.UpdateVisibility();
-                    }
-                }
-            }
+                this.IsJoinableGameSelected = value?.CanPlay == true;
+                if (value != null)
+                    Log.InfoFormat("Selected game {0} {1}", value.GameId, value.Name);
+                NotifyAndUpdate(ref _selectedGame, value);
+    }
         }
 
-        public bool ShowUninstalledGames {
-            get => _showUninstalledGames;
-            set {
-                if (NotifyAndUpdate(ref _showUninstalledGames, value)) {
-                    Prefs.HideUninstalledGamesInList = _showUninstalledGames == false;
-                    foreach (var g in HostedGameList.ToArray()) {
-                        g.UpdateVisibility();
-                    }
-                }
+        public bool HideUninstalledGames  {
+            get => Prefs.HideUninstalledGamesInList;
+            set
+            {
+                Prefs.HideUninstalledGamesInList = value;
+                OnPropertyChanged(nameof(HideUninstalledGames));
             }
         }
-
+        private bool _showKillGameButton;
         public bool ShowKillGameButton {
             get => _showKillGameButton;
             set => NotifyAndUpdate(ref _showKillGameButton, value);
         }
 
+        private int _gameCount;
         public int GameCount {
             get => _gameCount;
             set => NotifyAndUpdate(ref _gameCount, value);
         }
 
-        private readonly GameBroadcastListener broadcastListener;
+        private bool _isLoggedIn;
+        public bool IsLoggedIn
+        {
+            get => _isLoggedIn;
+            set => NotifyAndUpdate(ref _isLoggedIn, value);
+        }
 
-        private bool _loadingGame;
-        private bool _spectate;
-        private bool _showUninstalledGames;
-        private bool _showKillGameButton;
-        private int _gameCount;
+        private readonly GameBroadcastListener broadcastListener;
 
         public PlayTab() {
             InitializeComponent();
             broadcastListener = new GameBroadcastListener();
             broadcastListener.StartListening();
-            HostedGameList = new ObservableCollection<HostedGameViewModel>();
+            HostedGameList = new ObservableCollection<HostedGameViewModel>(); 
+            Program.LobbyClient.Connected += LobbyClient_OnConnect;
             Program.LobbyClient.Disconnected += LobbyClient_OnDisconnect;
             if (Program.Discord != null) {
             Program.Discord.JoinGame += Discord_JoinGame;
             }
-
-            Spectate = Prefs.SpectateGames;
             LoadingGame = true;
             ShowKillGameButton = Prefs.IsAdmin;
-            ShowUninstalledGames = Prefs.HideUninstalledGamesInList == false;
-
             _refreshGameListTimer = new DispatcherTimer(InitialRefreshDelay.TimeSpan, DispatcherPriority.Normal, RefreshGameListTimer_Tick, Dispatcher);
         }
 
         #region Game List Refreshing
 
+        private readonly DispatcherTimer _refreshGameListTimer;
+
+        private bool _isRefreshingGameList;
         public bool IsRefreshingGameList {
             get => _isRefreshingGameList;
             set => NotifyAndUpdate(ref _isRefreshingGameList, value);
         }
 
-        private bool _isRefreshingGameList;
-        private readonly DispatcherTimer _refreshGameListTimer;
-
         public static Duration InitialRefreshDelay { get; } = new Duration(TimeSpan.FromSeconds(2));
         public static Duration NormalRefreshDelay { get; } = new Duration(TimeSpan.FromSeconds(15));
 
+        private Duration _currentRefreshDelay = new Duration(TimeSpan.FromDays(10));
         public Duration CurrentRefreshDelay {
             get => _currentRefreshDelay;
             set {
@@ -124,9 +123,6 @@ public Duration CurrentRefreshDelay {
 
         public bool IsInitialRefresh => CurrentRefreshDelay.TimeSpan == InitialRefreshDelay.TimeSpan;
 
-        private Duration _currentRefreshDelay = new Duration(TimeSpan.FromDays(10));
-
-
         private async void Discord_JoinGame(object sender, Guid guid)
         {
             var game = HostedGameList.FirstOrDefault(x => x.Id == guid);
@@ -153,6 +149,7 @@ private async void RefreshGameListTimer_Tick(object sender, EventArgs e) {
                     var client = new ApiClient();
                     var hostedGames = await client.GetGameList();
                     games.AddRange(hostedGames.Select(x=>new HostedGameViewModel(x)));
+                    IsLoggedIn = true;
                 }
 
                 // Add local and lan games
@@ -193,9 +190,21 @@ public void VisibleChanged(bool visible) {
 
         }
 
+        void LobbyClient_OnConnect(object sender, ConnectedEventArgs e) {
+            Log.Info("Connected");
+            Dispatcher.InvokeAsync(new Action(() => {
+                this.HostedGameList.Clear();
+                this.IsLoggedIn = true;
+                this.CurrentRefreshDelay = InitialRefreshDelay;
+            }));
+        }
+
         void LobbyClient_OnDisconnect(object sender, DisconnectedEventArgs e) {
-            Log.Info("Disconnected");
-            Dispatcher.InvokeAsync(new Action(() => this.HostedGameList.Clear()));
+            Log.Info("Disconnected"); 
+            Dispatcher.InvokeAsync(new Action(() => {
+                this.HostedGameList.Clear();
+                this.IsLoggedIn = false;
+            }));
         }
 
         #endregion Game List Refreshing
@@ -240,23 +249,14 @@ public bool IsJoinableGameSelected {
             private set => SetValue(IsJoinableGameSelectedProperty, value);
         }
 
-        private void ListViewGameListSelectionChanged(object sender, SelectionChangedEventArgs e) {
-            Log.Info("Changed game selection");
-            var game = ListViewGameList.SelectedItem as HostedGameViewModel;
-            this.IsJoinableGameSelected = game?.CanPlay == true;
-
-            if (game != null)
-                Log.InfoFormat("Selected game {0} {1}", game.GameId, game.Name);
-        }
-
         private async void GameListItemDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            await JoinGame((HostedGameViewModel)ListViewGameList.SelectedItem);
+            await JoinGame(SelectedGame);
         }
 
         private async void ButtonJoinClick(object sender, RoutedEventArgs e)
         {
-            await JoinGame((HostedGameViewModel)ListViewGameList.SelectedItem);
+            await JoinGame(SelectedGame);
         }
 
         private async Task JoinGame(HostedGameViewModel game) {
@@ -265,7 +265,7 @@ private async Task JoinGame(HostedGameViewModel game) {
 
                 LoadingGame = false;
 
-                var hostedGame = await VerifyCanJoinGame(game);
+                var hostedGame = await VerifyCanJoinGame();
 
                 string username;
                 if (hostedGame.GameSource == "Online") {
@@ -286,13 +286,13 @@ var spectate
            }
         }
 
-        private async Task<HostedGameViewModel> VerifyCanJoinGame(HostedGameViewModel hostedGame) {
-
-            if (hostedGame.Status == HostedGameStatus.GameInProgress && hostedGame.Spectator == false) {
+        private async Task<HostedGameViewModel> VerifyCanJoinGame() {
+            if (SelectedGame == null) return null;
+            if (SelectedGame.Status == HostedGameStatus.GameInProgress && SelectedGame.Spectator == false) {
                 throw new UserMessageException("You can't join a game that is already in progress.");
             }
 
-            if (hostedGame.GameSource == "Online") {
+            if (SelectedGame.GameSource == "Online") {
                 var client = new ApiClient();
                 try {
                     if (!await client.IsGameServerRunning(Prefs.Username, Program.SessionKey)) {
@@ -303,12 +303,12 @@ private async Task<HostedGameViewModel> VerifyCanJoinGame(HostedGameViewModel ho
                 }
             }
 
-            var game = GameManager.Get().GetById(hostedGame.GameId);
+            var game = GameManager.Get().GetById(SelectedGame.GameId);
             if (game == null) {
                 throw new UserMessageException("You don't have the required game installed.");
             }
 
-            return hostedGame;
+            return SelectedGame;
         }
 
         #endregion Join Game
@@ -345,8 +345,7 @@ private void ConnectOfflineGameDialogOnClose(object sender, DialogResult dialogR
         #endregion Join Offline Game
 
         private void ButtonKillGame(object sender, RoutedEventArgs e) {
-            var hostedgame = ListViewGameList.SelectedItem as HostedGameViewModel;
-            if (hostedgame == null) return;
+            if (SelectedGame == null) return;
             if (Program.LobbyClient != null && Program.LobbyClient.User != null && Program.LobbyClient.IsConnected) {
                 throw new NotImplementedException("sorry bro");
             }
diff --git a/octgnFX/Octgn/Windows/Main.xaml b/octgnFX/Octgn/Windows/Main.xaml
index aeaa4d33f7..9f15d9d193 100644
--- a/octgnFX/Octgn/Windows/Main.xaml
+++ b/octgnFX/Octgn/Windows/Main.xaml
@@ -63,7 +63,7 @@
             <TabItem x:Name="TabMain" Header="OCTGN" Background="Transparent" Style="{StaticResource MainTabItem}">
                 <login:LoginTab></login:LoginTab>
             </TabItem>
-            <TabItem x:Name="TabCustomGames" Header="Play or Spectate" Style="{StaticResource MainTabItem}">
+            <TabItem x:Name="TabCustomGames" Header="Game Lobby" Style="{StaticResource MainTabItem}">
                 <playtab:PlayTab x:Name="TabCustomGamesList"></playtab:PlayTab>
             </TabItem>
             <TabItem x:Name="TabItemHistory" Header="Game History" Style="{StaticResource MainTabItem}">
diff --git a/recentchanges.txt b/recentchanges.txt
index b8b2b15165..7358d97114 100644
--- a/recentchanges.txt
+++ b/recentchanges.txt
@@ -1,3 +1,6 @@
+Redesigned the play/spectate tab to provide more useful user-feedback
+Changed some of the wording in the pre-game lobby controls
+A slightly less condescending notification when a player intentionally leaves the game
 o8build will give a more useful error if you use richtext symbols in a set but don't have a symbols element in the game XML.
 richtext symbol sizes will properly scale with the font size they are placed in
 changed 'hide alternates' to 'show alternates' in deck editor for clarity