diff --git a/qtc-net-client-2/Forms/Main.cs b/qtc-net-client-2/Forms/Main.cs
index 88b5573..9494213 100644
--- a/qtc-net-client-2/Forms/Main.cs
+++ b/qtc-net-client-2/Forms/Main.cs
@@ -364,7 +364,6 @@ namespace qtc_net_client_2
                     }
                 }
             }
-            else lvStoreItems.Clear();
         }
 
         private async void lvStoreItems_DoubleClick(object sender, EventArgs e)
@@ -588,6 +587,7 @@ namespace qtc_net_client_2
                     await RefreshRoomsList();
 
                     // set status context menu checked
+                    // TODO - figure out more efficient way to do this
                     UserStatus cuStatus = (UserStatus)_apiService.CurrentUser.Status;
                     switch (cuStatus)
                     {
@@ -778,11 +778,9 @@ namespace qtc_net_client_2
         {
             while (true)
             {
-                if (!IsHandleCreated) { LoggingService.LogString("Form Handle Wasn't Created"); return; }
-
-                if (InvokeRequired && !IsDisposed)
+                if(IsHandleCreated && !IsDisposed)
                 {
-                    BeginInvoke(async delegate ()
+                    await Invoke(async delegate ()
                     {
                         label.ForeColor = Color.Red;
                         await Task.Delay(500);
@@ -790,11 +788,6 @@ namespace qtc_net_client_2
                         await Task.Delay(500);
                     });
                 }
-
-                label.ForeColor = Color.Red;
-                await Task.Delay(500);
-                label.ForeColor = Color.Blue;
-                await Task.Delay(500);
             }
         }