From cb3e0628a348d7304f77b5790beb98c5f10d6355 Mon Sep 17 00:00:00 2001
From: mvlabat <mvlabat@gmail.com>
Date: Wed, 25 Jan 2023 00:43:46 +0200
Subject: [PATCH] Fix states for connecting, improve matchmaker UI

---
 ...Run mr_desktop_client (matchmaker).run.xml |   4 +-
 Cargo.lock                                    | 335 ++++++++++--------
 libs/client_lib/src/lib.rs                    |  14 +-
 libs/client_lib/src/net/mod.rs                |  48 ++-
 libs/client_lib/src/ui/main_menu_ui.rs        | 330 +++++++++++------
 libs/client_lib/src/ui/overlay_ui.rs          |  72 +++-
 libs/client_lib/src/ui/widgets/list_menu.rs   |  18 +-
 libs/shared_lib/src/messages.rs               |   1 +
 8 files changed, 531 insertions(+), 291 deletions(-)

diff --git a/.run/Run mr_desktop_client (matchmaker).run.xml b/.run/Run mr_desktop_client (matchmaker).run.xml
index e7b84a24..e7f04e24 100644
--- a/.run/Run mr_desktop_client (matchmaker).run.xml	
+++ b/.run/Run mr_desktop_client (matchmaker).run.xml	
@@ -7,10 +7,12 @@
     <option name="allFeatures" value="false" />
     <option name="emulateTerminal" value="false" />
     <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
     <envs>
-      <env name="RUST_LOG" value="mr_shared_lib=debug,mr_client_lib=debug" />
       <env name="MUDDLE_ENV" value="production" />
+      <env name="RUST_LOG" value="mr_shared_lib=debug,mr_client_lib=debug" />
+      <env name="MUDDLE_SERVER_IP_ADDR" value="127.0.0.1" />
     </envs>
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
diff --git a/Cargo.lock b/Cargo.lock
index ad9f5685..e3d3564e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "ab_glyph"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcdbc68024b653943864d436fe8a24b028095bc1cf91a8926f8241e4aaffe59"
+checksum = "e5568a4aa5ba8adf5175c5c460b030e27d8893412976cc37bef0e4fbc16cfbba"
 dependencies = [
  "ab_glyph_rasterizer",
  "owned_ttf_parser",
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "ab_glyph_rasterizer"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "330223a1aecc308757b9926e9391c9b47f8ef2dbd8aea9df88312aea18c5e8d6"
+checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
 
 [[package]]
 name = "actix-codec"
@@ -52,16 +52,16 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.2.2"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724"
+checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb"
 dependencies = [
  "actix-codec",
  "actix-rt",
  "actix-service",
  "actix-utils",
  "ahash 0.7.6",
- "base64 0.13.1",
+ "base64 0.21.0",
  "bitflags",
  "brotli",
  "bytes",
@@ -83,8 +83,10 @@ dependencies = [
  "rand",
  "sha1 0.10.5",
  "smallvec",
+ "tokio",
+ "tokio-util",
  "tracing",
- "zstd",
+ "zstd 0.12.2+zstd.1.5.2",
 ]
 
 [[package]]
@@ -112,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "actix-rt"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000"
+checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e"
 dependencies = [
  "futures-core",
  "tokio",
@@ -122,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "actix-server"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824"
+checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327"
 dependencies = [
  "actix-rt",
  "actix-service",
@@ -161,9 +163,9 @@ dependencies = [
 
 [[package]]
 name = "actix-web"
-version = "4.2.1"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9"
+checksum = "464e0fddc668ede5f26ec1f9557a8d44eda948732f40c6b0ad79126930eb775f"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -403,7 +405,7 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc120354d1b5ec6d7aaf4876b602def75595937b5e15d356eb554ab5177e08bb"
 dependencies = [
- "clipboard-win 4.4.2",
+ "clipboard-win 4.5.0",
  "core-graphics",
  "image 0.23.14",
  "log",
@@ -433,9 +435,9 @@ dependencies = [
 
 [[package]]
 name = "ash"
-version = "0.37.1+1.3.235"
+version = "0.37.2+1.3.238"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "911015c962d56e2e4052f40182ca5462ba60a3d2ff04e827c365a0ab3d65726d"
+checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03"
 dependencies = [
  "libloading",
 ]
@@ -446,7 +448,7 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
 dependencies = [
- "concurrent-queue 2.0.0",
+ "concurrent-queue 2.1.0",
  "event-listener",
  "futures-core",
 ]
@@ -469,7 +471,7 @@ checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b"
 dependencies = [
  "async-lock",
  "async-task",
- "concurrent-queue 2.0.0",
+ "concurrent-queue 2.1.0",
  "fastrand",
  "futures-lite",
  "slab",
@@ -495,7 +497,7 @@ checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
 dependencies = [
  "async-lock",
  "autocfg",
- "concurrent-queue 2.0.0",
+ "concurrent-queue 2.1.0",
  "futures-lite",
  "libc",
  "log",
@@ -576,9 +578,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.60"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
+checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -607,9 +609,9 @@ dependencies = [
 
 [[package]]
 name = "atomic-waker"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a"
+checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
 
 [[package]]
 name = "atomic_refcell"
@@ -625,9 +627,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48"
+checksum = "678c5130a507ae3a7c797f9a17393c14849300b8440eac47cdb90a5bdcb3a543"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -654,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
+checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34"
 dependencies = [
  "async-trait",
  "bytes",
@@ -708,6 +710,12 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
 
+[[package]]
+name = "base64"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+
 [[package]]
 name = "base64ct"
 version = "1.5.3"
@@ -890,7 +898,7 @@ dependencies = [
 [[package]]
 name = "bevy_disturbulence"
 version = "0.1.0"
-source = "git+https://github.com/mvlabat/bevy_disturbulence.git?branch=wip#7ec97b06de25e8077dba78bee44bb2a1c1c85c7e"
+source = "git+https://github.com/mvlabat/bevy_disturbulence.git?branch=wip#264823b4934d6534bd6620ad7b2e15ee8ddad69c"
 dependencies = [
  "bevy",
  "bytes",
@@ -1575,9 +1583,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.2"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
+checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -1585,24 +1593,24 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.11.1"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
 
 [[package]]
 name = "bytemuck"
-version = "1.12.3"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f"
+checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4"
+checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1668,7 +1676,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
- "nom 7.1.2",
+ "nom 7.1.3",
 ]
 
 [[package]]
@@ -1743,9 +1751,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.4.2"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219"
+checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
 dependencies = [
  "error-code",
  "str-buf",
@@ -1820,9 +1828,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b"
+checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1981,7 +1989,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
 dependencies = [
- "crc-catalog 2.1.0",
+ "crc-catalog 2.2.0",
 ]
 
 [[package]]
@@ -1992,9 +2000,9 @@ checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403"
 
 [[package]]
 name = "crc-catalog"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff"
+checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
 
 [[package]]
 name = "crc32fast"
@@ -2134,9 +2142,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.85"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
+checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -2146,9 +2154,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.85"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
+checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -2161,15 +2169,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.85"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
+checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.85"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
+checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2371,7 +2379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cddf120f700b411b2b02ebeb7f04dc0b7c8835909a6c2f52bf72ed0dd3433b2"
 dependencies = [
  "der-oid-macro 0.5.0",
- "nom 7.1.2",
+ "nom 7.1.3",
  "num-bigint",
  "num-traits",
  "rusticata-macros 4.1.0",
@@ -3032,9 +3040,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec"
 
 [[package]]
 name = "glam"
@@ -3048,9 +3056,9 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "glow"
@@ -3466,7 +3474,7 @@ checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
  "http",
  "hyper 0.14.23",
- "rustls 0.20.7",
+ "rustls 0.20.8",
  "tokio",
  "tokio-rustls",
 ]
@@ -3628,9 +3636,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
  "windows-sys 0.42.0",
@@ -3638,9 +3646,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
+checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
 
 [[package]]
 name = "is-terminal"
@@ -4726,9 +4734,9 @@ dependencies = [
 
 [[package]]
 name = "nom"
-version = "7.1.2"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
  "memchr",
  "minimal-lexical",
@@ -4806,9 +4814,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
 dependencies = [
  "num-traits",
  "serde",
@@ -4951,9 +4959,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.30.1"
+version = "0.30.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
 dependencies = [
  "memchr",
 ]
@@ -5099,9 +5107,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owned_ttf_parser"
-version = "0.17.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18904d3c65493a9f0d7542293d1a7f69bfdc309a6b9ef4f46dc3e58b0577edc5"
+checksum = "2a5f3c7ca08b6879e7965fb25e24d1f5eeb32ea73f9ad99b3854778a38c57e93"
 dependencies = [
  "ttf-parser",
 ]
@@ -5141,7 +5149,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.5",
+ "parking_lot_core 0.9.6",
 ]
 
 [[package]]
@@ -5160,9 +5168,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
 dependencies = [
  "cfg-if",
  "libc",
@@ -5207,9 +5215,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
 dependencies = [
  "base64 0.13.1",
 ]
@@ -5383,9 +5391,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
 dependencies = [
  "unicode-ident",
 ]
@@ -5412,9 +5420,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592"
+checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5422,9 +5430,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720"
+checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d"
 dependencies = [
  "anyhow",
  "itertools",
@@ -5457,7 +5465,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "ruzstd",
  "serde",
- "zstd",
+ "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
@@ -5629,9 +5637,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -5670,11 +5678,11 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157"
 
 [[package]]
 name = "reqwest"
-version = "0.11.13"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
+checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -5693,7 +5701,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.20.7",
+ "rustls 0.20.8",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -5829,14 +5837,14 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632"
 dependencies = [
- "nom 7.1.2",
+ "nom 7.1.3",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.6"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
 dependencies = [
  "bitflags",
  "errno",
@@ -5861,9 +5869,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
 dependencies = [
  "log",
  "ring",
@@ -5873,11 +5881,11 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
+checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.0",
 ]
 
 [[package]]
@@ -5938,12 +5946,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
 dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -6034,9 +6041,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "645926f31b250a2dca3c232496c2d898d91036e45ca0e97e0e2390c54e11be36"
 dependencies = [
  "bitflags",
  "core-foundation",
@@ -6047,9 +6054,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6514,12 +6521,12 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87e292b4291f154971a43c3774364e2cbcaec599d3f5bf6fa9d122885dbc38a"
+checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
 dependencies = [
  "itertools",
- "nom 7.1.2",
+ "nom 7.1.3",
  "unicode_categories",
 ]
 
@@ -6771,9 +6778,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
  "winapi-util",
 ]
@@ -6879,9 +6886,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.24.1"
+version = "1.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
+checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
 dependencies = [
  "autocfg",
  "bytes",
@@ -6946,7 +6953,7 @@ version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls 0.20.7",
+ "rustls 0.20.8",
  "tokio",
  "webpki 0.22.0",
 ]
@@ -6990,9 +6997,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
@@ -7173,15 +7180,15 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "ttf-parser"
-version = "0.17.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "375812fa44dab6df41c195cd2f7fecb488f6c09fbaafb62807488cefab642bff"
+checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633"
 
 [[package]]
 name = "tungstenite"
@@ -7244,9 +7251,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
 
 [[package]]
 name = "unicode-ident"
@@ -7305,9 +7312,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "ureq"
-version = "2.6.1"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733b5ad78377302af52c0dbcb2623d78fe50e4b3bf215948ff29e9ee031d8566"
+checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d"
 dependencies = [
  "base64 0.13.1",
  "log",
@@ -7832,12 +7839,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc 0.42.1",
 ]
 
 [[package]]
@@ -7860,19 +7867,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc 0.42.1",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7888,9 +7895,9 @@ checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7906,9 +7913,9 @@ checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7924,9 +7931,9 @@ checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7942,15 +7949,15 @@ checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7966,9 +7973,9 @@ checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
 
 [[package]]
 name = "winit"
@@ -8043,12 +8050,12 @@ dependencies = [
 
 [[package]]
 name = "x11-dl"
-version = "2.20.1"
+version = "2.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
 dependencies = [
- "lazy_static",
  "libc",
+ "once_cell",
  "pkg-config",
 ]
 
@@ -8104,7 +8111,7 @@ dependencies = [
  "data-encoding",
  "der-parser 6.0.1",
  "lazy_static",
- "nom 7.1.2",
+ "nom 7.1.3",
  "oid-registry 0.2.0",
  "ring",
  "rusticata-macros 4.1.0",
@@ -8172,7 +8179,16 @@ version = "0.11.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
 dependencies = [
- "zstd-safe",
+ "zstd-safe 5.0.2+zstd.1.5.2",
+]
+
+[[package]]
+name = "zstd"
+version = "0.12.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9262a83dc741c0b0ffec209881b45dbc232c21b02a2b9cb1adb93266e41303d"
+dependencies = [
+ "zstd-safe 6.0.2+zstd.1.5.2",
 ]
 
 [[package]]
@@ -8185,12 +8201,23 @@ dependencies = [
  "zstd-sys",
 ]
 
+[[package]]
+name = "zstd-safe"
+version = "6.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6cf39f730b440bab43da8fb5faf5f254574462f73f260f85f7987f32154ff17"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
-version = "2.0.4+zstd.1.5.2"
+version = "2.0.5+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0"
+checksum = "edc50ffce891ad571e9f9afe5039c4837bede781ac4bb13052ed7ae695518596"
 dependencies = [
  "cc",
  "libc",
+ "pkg-config",
 ]
diff --git a/libs/client_lib/src/lib.rs b/libs/client_lib/src/lib.rs
index 22b1d3be..af56eff4 100644
--- a/libs/client_lib/src/lib.rs
+++ b/libs/client_lib/src/lib.rs
@@ -14,12 +14,11 @@ use crate::{
         auth::read_offline_auth_config_system, fill_actual_frames_ahead_system,
         has_server_to_connect, init_matchmaker_connection_system, maintain_connection_system,
         process_network_events_system, send_network_updates_system, send_requests_system,
-        ServerToConnect,
+        ServerToConnect, DEFAULT_SERVER_IP_ADDR,
     },
     ui::{
         builder_ui::{EditedLevelObject, EditedObjectUpdate},
         debug_ui::update_debug_ui_state_system,
-        main_menu_ui::matchmaker_is_initialised,
     },
     visuals::{
         control_builder_visibility_system, process_control_points_input_system,
@@ -72,6 +71,14 @@ pub struct MuddleClientPlugin;
 
 impl Plugin for MuddleClientPlugin {
     fn build(&self, app: &mut App) {
+        let config_server_addr = app
+            .world
+            .get_resource::<MuddleClientConfig>()
+            .expect("Expected MuddleClientConfig to be initialised before MuddleClientPlugin")
+            .server_addr
+            .unwrap_or_else(|| SocketAddr::new(DEFAULT_SERVER_IP_ADDR, DEFAULT_SERVER_PORT))
+            .to_string();
+
         let input_stage = SystemStage::single_threaded()
             .with_system(maintain_connection_system.run_not_in_state(AppState::Loading))
             // Processing network events should happen before tracking input:
@@ -99,7 +106,7 @@ impl Plugin for MuddleClientPlugin {
             .add_plugin(WorldInspectorPlugin::new())
             .init_resource::<WindowInnerSize>()
             .init_resource::<input::MouseScreenPosition>()
-            .init_resource::<ui::main_menu_ui::MainMenuUiState>()
+            .insert_resource(ui::main_menu_ui::MainMenuUiState::new(config_server_addr))
             .add_event::<EditedObjectUpdate>()
             // Startup systems.
             .add_startup_system(init_matchmaker_connection_system)
@@ -139,7 +146,6 @@ impl Plugin for MuddleClientPlugin {
             .add_system(
                 ui::main_menu_ui::main_menu_ui_system
                     .run_in_state(AppState::MainMenu)
-                    .run_if(matchmaker_is_initialised)
                     .run_if_not(has_server_to_connect)
                     .after("process_io_messages"),
             )
diff --git a/libs/client_lib/src/net/mod.rs b/libs/client_lib/src/net/mod.rs
index 5365ca5f..fa428b55 100644
--- a/libs/client_lib/src/net/mod.rs
+++ b/libs/client_lib/src/net/mod.rs
@@ -12,10 +12,10 @@ use crate::{
 };
 use auth::{AuthMessage, AuthRequest};
 use bevy::{ecs::system::SystemParam, log, prelude::*, utils::Instant};
-use bevy_disturbulence::{NetworkEvent, NetworkResource};
+use bevy_disturbulence::{IncomingTrySendError, NetworkError, NetworkEvent, NetworkResource};
 use futures::{select, FutureExt};
 use iyes_loopless::state::NextState;
-use mr_messages_lib::{MatchmakerMessage, MatchmakerRequest, Server};
+use mr_messages_lib::{GameServerState, MatchmakerMessage, MatchmakerRequest, Server};
 use mr_shared_lib::{
     framebuffer::{FrameNumber, Framebuffer},
     game::{
@@ -59,7 +59,7 @@ mod persistence;
 mod redirect_uri_server;
 
 pub const DEFAULT_SERVER_PORT: u16 = 3455;
-const DEFAULT_SERVER_IP_ADDR: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
+pub const DEFAULT_SERVER_IP_ADDR: IpAddr = IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1));
 
 #[derive(SystemParam)]
 pub struct UpdateParams<'w, 's> {
@@ -328,6 +328,11 @@ pub fn process_network_events_system(
             }
             NetworkEvent::Error(handle, err) => {
                 log::error!("Network error ({}): {:?}", handle, err);
+                if let NetworkError::TurbulenceChannelError(IncomingTrySendError::Error(_)) = err {
+                    network_params
+                        .connection_state
+                        .set_status(ConnectionStatus::Disconnecting(DisconnectReason::Aborted));
+                };
             }
             _ => {}
         }
@@ -723,6 +728,7 @@ pub fn maintain_connection_system(
     mut matchmaker_params: MatchmakerParams,
     mut network_params: NetworkParams,
     mut initial_rtt: ResMut<InitialRtt>,
+    mut initialised_server_to_connect_without_matchmaker: Local<bool>,
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
@@ -765,7 +771,7 @@ pub fn maintain_connection_system(
     );
 
     // TODO: if a client isn't getting any updates, we may also want to pause the
-    // game and wait for some time for a server to respond.
+    //  game and wait for some time for a server to respond.
 
     let connection_has_timed_out = Instant::now().duration_since(
         network_params
@@ -812,11 +818,8 @@ pub fn maintain_connection_system(
             .set_status(ConnectionStatus::Uninitialized);
     }
 
-    // TODO! so I left off after just finishing with the loading states, need to
-    //  sort out the menu app state and running conditions
-
     if network_params.net.connections.is_empty() {
-        let addr = if let Some((matchmaker_state, matchmaker_channels)) = matchmaker.as_mut() {
+        if let Some((matchmaker_state, matchmaker_channels)) = matchmaker.as_mut() {
             if matches!(matchmaker_state.status, TcpConnectionStatus::Disconnected) {
                 log::trace!("Requesting a connection to the matchmaker");
                 matchmaker_channels
@@ -825,22 +828,31 @@ pub fn maintain_connection_system(
                     .expect("Failed to write to a channel (matchmaker connection request)");
                 return;
             }
-
-            let Some(server) = &**matchmaker_params.server_to_connect else {
-                return;
-            };
-            log::info!("Connecting to {}: {}", server.name, server.addr);
-            format!("http://{}", server.addr)
-        } else {
+        } else if !*initialised_server_to_connect_without_matchmaker {
+            // We want to init the connection to a server only once.
+            // If a client disconnects, they'll be able to re-connect via the main menu.
+            *initialised_server_to_connect_without_matchmaker = true;
             let server_socket_addr = client_config
                 .server_addr
                 .unwrap_or_else(|| SocketAddr::new(DEFAULT_SERVER_IP_ADDR, DEFAULT_SERVER_PORT));
 
-            log::info!("Connecting to {}", server_socket_addr);
-            format!("http://{server_socket_addr}")
+            **matchmaker_params.server_to_connect = Some(Server {
+                name: "Unknown".to_string(),
+                state: GameServerState::Ready,
+                addr: server_socket_addr,
+                player_capacity: 0,
+                player_count: 0,
+                request_id: Default::default(),
+            });
         };
 
-        network_params.net.connect(&addr);
+        let Some(server) = &**matchmaker_params.server_to_connect else {
+            return;
+        };
+        log::info!("Connecting to {}: {}", server.name, server.addr);
+        network_params
+            .net
+            .connect(&format!("http://{}", server.addr));
     }
 }
 
diff --git a/libs/client_lib/src/ui/main_menu_ui.rs b/libs/client_lib/src/ui/main_menu_ui.rs
index df7a2417..a9af89ee 100644
--- a/libs/client_lib/src/ui/main_menu_ui.rs
+++ b/libs/client_lib/src/ui/main_menu_ui.rs
@@ -5,10 +5,10 @@ use crate::{
         ServerToConnect, TcpConnectionStatus,
     },
     ui::{
-        widgets::list_menu::{button_panel, MenuListItem, PanelButton},
+        widgets::list_menu::{button_panel, MenuListItem, MenuListItemResponse, PanelButton},
         without_item_spacing,
     },
-    MuddleClientConfig, OfflineAuthConfig,
+    OfflineAuthConfig,
 };
 use bevy::{
     ecs::{
@@ -19,7 +19,11 @@ use bevy::{
     utils::{HashMap, Instant, Uuid},
     window::Windows,
 };
-use bevy_egui::{egui, egui::Widget, EguiContext};
+use bevy_egui::{
+    egui,
+    egui::{Ui, Widget},
+    EguiContext,
+};
 use iyes_loopless::prelude::*;
 use mr_messages_lib::{
     GameServerState, GetLevelResponse, GetLevelsRequest, GetLevelsUserFilter, InitLevel,
@@ -30,6 +34,7 @@ use mr_shared_lib::net::MessageId;
 use std::{
     collections::BTreeMap,
     marker::PhantomData,
+    net::SocketAddr,
     ops::{Add, Mul, Sub},
     time::Duration,
 };
@@ -217,10 +222,11 @@ impl Default for AuthUiScreen {
     }
 }
 
-#[derive(Default)]
 pub struct MatchmakerUiState {
     observed_no_ready_servers_at: Option<Instant>,
     servers: HashMap<String, Server>,
+    connect_manually_is_active: bool,
+    connect_manually_ip_addr: String,
     // Contains a sever name, as we don't want selection to jump every time a server is
     // added/removed.
     selected_server: Option<String>,
@@ -258,6 +264,7 @@ impl Default for SelectedLevel {
     }
 }
 
+#[derive(Clone, Copy)]
 pub enum MatchmakerUiScreen {
     ServersList,
     CreateServer,
@@ -282,13 +289,40 @@ impl Default for LevelsListFilter {
     }
 }
 
-#[derive(Resource, Default)]
+#[derive(Resource)]
 pub struct MainMenuUiState {
     screen: MainMenuUiScreen,
     auth: AuthUiState,
     matchmaker: MatchmakerUiState,
 }
 
+impl MainMenuUiState {
+    pub fn new(connect_manually_ip_addr: String) -> Self {
+        Self {
+            screen: Default::default(),
+            auth: Default::default(),
+            matchmaker: MatchmakerUiState {
+                observed_no_ready_servers_at: None,
+                servers: Default::default(),
+                connect_manually_is_active: false,
+                connect_manually_ip_addr,
+                selected_server: None,
+                levels: Default::default(),
+                levels_list_filter: Default::default(),
+                selected_level: Default::default(),
+                selected_level_data: None,
+                screen: Default::default(),
+                request_id_counter: Default::default(),
+                current_request_id: None,
+                pending_create_server_request: None,
+                create_server_request_sent_at: None,
+                request_error_message: None,
+            },
+        }
+    }
+}
+
+#[derive(Copy, Clone)]
 pub enum MainMenuUiScreen {
     Auth,
     Matchmaker,
@@ -302,7 +336,6 @@ impl Default for MainMenuUiScreen {
 
 #[derive(SystemParam)]
 pub struct Configs<'w, 's> {
-    client_config: Res<'w, MuddleClientConfig>,
     offline_auth_config: Res<'w, OfflineAuthConfig>,
     #[system_param(ignore)]
     _marker: PhantomData<&'s ()>,
@@ -350,25 +383,27 @@ pub fn main_menu_ui_system(
     mut ui_context: UiContext,
     configs: Configs,
     mut main_menu_ui_state: ResMut<MainMenuUiState>,
-    matchmaker_state: Res<MatchmakerState>,
-    mut main_menu_ui_channels: ResMut<MainMenuUiChannels>,
+    matchmaker_state: Option<Res<MatchmakerState>>,
+    mut main_menu_ui_channels: Option<ResMut<MainMenuUiChannels>>,
     mut server_to_connect: ResMut<ServerToConnect>,
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
 
-    if !matches!(matchmaker_state.status, TcpConnectionStatus::Connected) {
-        main_menu_ui_state.matchmaker.servers.clear();
-    }
+    if let Some(matchmaker_state) = &matchmaker_state {
+        if !matches!(matchmaker_state.status, TcpConnectionStatus::Connected) {
+            main_menu_ui_state.matchmaker.servers.clear();
+        }
 
-    if !main_menu_ui_state.matchmaker.has_ready_server()
-        && matches!(matchmaker_state.status, TcpConnectionStatus::Connected)
-        && main_menu_ui_state
-            .matchmaker
-            .observed_no_ready_servers_at
-            .is_none()
-    {
-        main_menu_ui_state.matchmaker.observed_no_ready_servers_at = Some(Instant::now());
+        if !main_menu_ui_state.matchmaker.has_ready_server()
+            && matches!(matchmaker_state.status, TcpConnectionStatus::Connected)
+            && main_menu_ui_state
+                .matchmaker
+                .observed_no_ready_servers_at
+                .is_none()
+        {
+            main_menu_ui_state.matchmaker.observed_no_ready_servers_at = Some(Instant::now());
+        }
     }
 
     let screen_height = ui_context.windows.get_primary().unwrap().height();
@@ -392,39 +427,43 @@ pub fn main_menu_ui_system(
                 .fixed_size(egui::Vec2::new(window_width, window_height))
                 .show(ui.ctx(), |ui| {
                     let MainMenuUiState {
-                        screen: ref mut main_menu_ui_screen,
+                        screen: main_menu_ui_screen,
                         auth: auth_ui_state,
                         matchmaker: matchmaker_ui_state,
                     } = &mut *main_menu_ui_state;
 
-                    match matchmaker_state.status {
-                        TcpConnectionStatus::Connected => {
-                            // Header.
-                            if !matchmaker_ui_state.has_ready_server()
-                                && matchmaker_ui_state.pending_create_server_request.is_some()
-                            {
-                                let progress = Instant::now()
-                                    .duration_since(
-                                        matchmaker_ui_state.observed_no_ready_servers_at.unwrap(),
-                                    )
-                                    .as_secs_f32()
-                                    / 120.0;
-                                status_bar(
-                                    ui,
-                                    "Spinning up a game server (might take a couple of minutes)...",
-                                    progress.min(0.95),
-                                );
-                            } else {
-                                status_bar(ui, "Matchmaker server: connected", 1.0);
+                    if let Some(matchmaker_state) = &matchmaker_state {
+                        match matchmaker_state.status {
+                            TcpConnectionStatus::Connected => {
+                                // Header.
+                                if !matchmaker_ui_state.has_ready_server()
+                                    && matchmaker_ui_state.pending_create_server_request.is_some()
+                                {
+                                    let progress = Instant::now()
+                                        .duration_since(
+                                            matchmaker_ui_state.observed_no_ready_servers_at.unwrap(),
+                                        )
+                                        .as_secs_f32()
+                                        / 120.0;
+                                    status_bar(
+                                        ui,
+                                        "Spinning up a game server (might take a couple of minutes)...",
+                                        progress.min(0.95),
+                                    );
+                                } else {
+                                    status_bar(ui, "Matchmaker server: connected", 1.0);
+                                }
+                            }
+                            TcpConnectionStatus::Connecting | TcpConnectionStatus::Disconnected => {
+                                status_bar(ui, "Connecting to the matchmaker...", 0.0);
                             }
                         }
-                        TcpConnectionStatus::Connecting | TcpConnectionStatus::Disconnected => {
-                            status_bar(ui, "Connecting to the matchmaker...", 0.0);
-                        }
+                    } else {
+                        status_bar(ui, "Matchmaker address isn't set", 0.0);
                     }
 
-                    match main_menu_ui_screen {
-                        MainMenuUiScreen::Auth => {
+                    match (*main_menu_ui_screen, main_menu_ui_channels.as_deref_mut()) {
+                        (MainMenuUiScreen::Auth, Some(main_menu_ui_channels)) => {
                             egui::containers::Frame::none()
                                 .inner_margin(egui::style::Margin::symmetric(25.0, 15.0))
                                 .show(ui, |ui| {
@@ -439,13 +478,13 @@ pub fn main_menu_ui_system(
                                     }
                                 });
                         }
-                        MainMenuUiScreen::Matchmaker => {
+                        (MainMenuUiScreen::Matchmaker | MainMenuUiScreen::Auth, main_menu_ui_channels) => {
                             matchmaker_screen(
                                 ui,
-                                &matchmaker_state,
+                                matchmaker_state.as_deref(),
                                 matchmaker_ui_state,
                                 &mut server_to_connect,
-                                &mut main_menu_ui_channels,
+                                main_menu_ui_channels,
                             );
                         }
                     }
@@ -541,9 +580,7 @@ pub fn process_auth_messages_system(
 }
 
 pub fn process_matchmaker_messages_system(
-    mut matchmaker_state: ResMut<MatchmakerState>,
     mut main_menu_ui_state: ResMut<MainMenuUiState>,
-    configs: Configs,
     mut main_menu_ui_channels: ResMut<MainMenuUiChannels>,
     mut server_to_connect: ResMut<ServerToConnect>,
 ) {
@@ -584,24 +621,7 @@ pub fn process_matchmaker_messages_system(
         }
 
         match main_menu_ui_channels.matchmaker_message_rx.try_recv() {
-            Ok(MatchmakerMessage::Init {
-                servers: mut init_list,
-            }) => {
-                if let Some(server_addr) = configs.client_config.server_addr {
-                    init_list.push(Server {
-                        name: "localhost".to_string(),
-                        state: GameServerState::Allocated,
-                        addr: server_addr,
-                        player_capacity: 0,
-                        player_count: 0,
-                        request_id: Default::default(),
-                    });
-                    // Sometimes, a matchmaker status message may come one frame late, which will
-                    // cause the server list to reset. We can safely set the status to `Connected`
-                    // as soon as we get the init message as well.
-                    matchmaker_state.status = TcpConnectionStatus::Connected;
-                }
-
+            Ok(MatchmakerMessage::Init { servers: init_list }) => {
                 log::debug!("Initialize servers list: {:?}", init_list);
                 main_menu_ui_state.matchmaker.servers = init_list
                     .into_iter()
@@ -969,29 +989,36 @@ fn authentication_screen(
 
 fn matchmaker_screen(
     ui: &mut egui::Ui,
-    matchmaker_state: &MatchmakerState,
+    matchmaker_state: Option<&MatchmakerState>,
     matchmaker_ui_state: &mut MatchmakerUiState,
     server_to_connect: &mut Option<Server>,
-    main_menu_ui_channels: &mut MainMenuUiChannels,
+    main_menu_ui_channels: Option<&mut MainMenuUiChannels>,
 ) {
-    match matchmaker_ui_state.screen {
-        MatchmakerUiScreen::ServersList => matchmaker_servers_list_screen(
-            ui,
-            server_to_connect,
-            matchmaker_ui_state,
-            main_menu_ui_channels.persistence_request_tx.clone(),
-        ),
-        MatchmakerUiScreen::CreateServer
+    match (matchmaker_ui_state.screen, matchmaker_state) {
+        (MatchmakerUiScreen::CreateServer, Some(_matchmaker_state))
             if matchmaker_ui_state.pending_create_server_request.is_some() =>
         {
             connect_to_server_screen(ui, matchmaker_ui_state)
         }
-        MatchmakerUiScreen::CreateServer => matchmaker_create_server_screen(
-            ui,
-            matchmaker_state,
-            matchmaker_ui_state,
-            main_menu_ui_channels.persistence_request_tx.clone(),
-        ),
+        (MatchmakerUiScreen::CreateServer, Some(matchmaker_state)) => {
+            matchmaker_create_server_screen(
+                ui,
+                matchmaker_state,
+                matchmaker_ui_state,
+                main_menu_ui_channels
+                    .expect("Expected UI channels to exist when matchmaker state exists")
+                    .persistence_request_tx
+                    .clone(),
+            )
+        }
+        (MatchmakerUiScreen::ServersList | MatchmakerUiScreen::CreateServer, _) => {
+            matchmaker_servers_list_screen(
+                ui,
+                server_to_connect,
+                matchmaker_ui_state,
+                main_menu_ui_channels.map(|channels| channels.persistence_request_tx.clone()),
+            )
+        }
     }
 }
 
@@ -999,7 +1026,7 @@ fn matchmaker_servers_list_screen(
     ui: &mut egui::Ui,
     server_to_connect: &mut Option<Server>,
     matchmaker_ui_state: &mut MatchmakerUiState,
-    persistence_requests_tx: UnboundedSender<PersistenceRequest>,
+    persistence_requests_tx: Option<UnboundedSender<PersistenceRequest>>,
 ) {
     // Server list.
     let mut sorted_servers = matchmaker_ui_state
@@ -1013,29 +1040,60 @@ fn matchmaker_servers_list_screen(
         egui::containers::ScrollArea::vertical()
             .max_height(500.0)
             .show(ui, |ui| {
-                let response = MenuListItem::new("Create a server")
-                    .secondary_widget(|ui| {
-                        ui.label("Create a server to let other players join");
-                    })
-                    .image_widget(plus_image)
-                    .show(ui);
-                if response.item.clicked() {
-                    matchmaker_ui_state.selected_server = None;
-                    matchmaker_ui_state.screen = MatchmakerUiScreen::CreateServer;
-                    let request_id = matchmaker_ui_state.request_id_counter.increment();
-                    matchmaker_ui_state.current_request_id = Some(request_id);
-                    persistence_requests_tx
-                        .send(PersistenceRequest::GetLevels {
-                            request_id,
-                            body: GetLevelsRequest {
-                                user_filter: None,
-                                pagination: PaginationParams {
-                                    offset: 0,
-                                    limit: 20,
-                                },
-                            },
+                if let Some(persistence_requests_tx) = persistence_requests_tx {
+                    let response = MenuListItem::new("Create a server")
+                        .secondary_widget(|ui| {
+                            ui.label("Create a server to let other players join");
                         })
-                        .expect("Failed to write to a channel (persistence request)");
+                        .image_widget(plus_image)
+                        .show(ui);
+                    if response.item.clicked() {
+                        matchmaker_ui_state.connect_manually_is_active = false;
+                        matchmaker_ui_state.selected_server = None;
+                        matchmaker_ui_state.screen = MatchmakerUiScreen::CreateServer;
+                        let request_id = matchmaker_ui_state.request_id_counter.increment();
+                        matchmaker_ui_state.current_request_id = Some(request_id);
+                        persistence_requests_tx
+                            .send(PersistenceRequest::GetLevels {
+                                request_id,
+                                body: GetLevelsRequest {
+                                    user_filter: None,
+                                    pagination: PaginationParams {
+                                        offset: 0,
+                                        limit: 20,
+                                    },
+                                },
+                            })
+                            .expect("Failed to write to a channel (persistence request)");
+                    }
+                }
+
+                let connect_response = connect_manually_item(
+                    &mut matchmaker_ui_state.connect_manually_ip_addr,
+                    matchmaker_ui_state.connect_manually_is_active,
+                    ui,
+                );
+                if connect_response.item.clicked() {
+                    matchmaker_ui_state.connect_manually_is_active = true;
+                    matchmaker_ui_state.selected_server = None;
+                }
+                if connect_response.secondary.clicked() {
+                    match matchmaker_ui_state.connect_manually_ip_addr.parse() {
+                        Ok(addr) => {
+                            matchmaker_ui_state.connect_manually_is_active = false;
+                            *server_to_connect = Some(Server {
+                                name: "Unknown".to_string(),
+                                state: GameServerState::Ready,
+                                addr,
+                                player_capacity: 0,
+                                player_count: 0,
+                                request_id: Default::default(),
+                            });
+                        }
+                        Err(err) => {
+                            log::error!("Invalid server addr: {err:?}");
+                        }
+                    }
                 }
 
                 server_list(
@@ -1043,6 +1101,9 @@ fn matchmaker_servers_list_screen(
                     &sorted_servers,
                     &mut matchmaker_ui_state.selected_server,
                 );
+                if matchmaker_ui_state.selected_server.is_some() {
+                    matchmaker_ui_state.connect_manually_is_active = false;
+                }
             });
     });
 
@@ -1068,6 +1129,36 @@ fn matchmaker_servers_list_screen(
     }
 }
 
+fn connect_manually_item(
+    connect_manually_ip_addr: &mut String,
+    is_active: bool,
+    ui: &mut Ui,
+) -> MenuListItemResponse<egui::Response, ()> {
+    MenuListItem::new("Connect manually")
+        .secondary_widget(|ui| {
+            if !is_active {
+                return ui.label("Select to connect to a server by IP");
+            }
+
+            ui.horizontal(|ui| {
+                ui.style_mut().visuals.widgets.inactive.bg_stroke =
+                    ui.style_mut().visuals.window_stroke();
+                egui::widgets::TextEdit::singleline(connect_manually_ip_addr)
+                    .desired_width(150.0)
+                    .show(ui);
+                ui.add_enabled(
+                    connect_manually_ip_addr.parse::<SocketAddr>().is_ok(),
+                    egui::widgets::Button::new("Connect"),
+                )
+                .on_disabled_hover_text("Enter a valid server address to connect")
+            })
+            .inner
+        })
+        .selected(is_active)
+        .image_widget(circle_image)
+        .show(ui)
+}
+
 fn matchmaker_create_server_screen(
     ui: &mut egui::Ui,
     matchmaker_state: &MatchmakerState,
@@ -1423,3 +1514,30 @@ fn plus_image(ui: &mut egui::Ui) {
     ui.painter()
         .rect_filled(vertical, 0.0, ui.visuals().widgets.inactive.bg_fill);
 }
+
+#[allow(dead_code)]
+fn cancel_image(ui: &mut egui::Ui) {
+    ui.painter().circle_stroke(
+        ui.max_rect().center(),
+        14.0,
+        egui::Stroke::new(3.0, ui.visuals().widgets.inactive.bg_fill),
+    );
+    let mut mesh = egui::Mesh::with_texture(egui::TextureId::Managed(0));
+    mesh.add_colored_rect(
+        egui::Rect::from_center_size(ui.max_rect().center(), egui::Vec2::new(28.0, 4.0)),
+        ui.visuals().widgets.inactive.bg_fill,
+    );
+    mesh.rotate(
+        egui::emath::Rot2::from_angle(-std::f32::consts::FRAC_PI_4),
+        ui.max_rect().center(),
+    );
+    ui.painter().add(mesh);
+}
+
+fn circle_image(ui: &mut egui::Ui) {
+    ui.painter().circle_stroke(
+        ui.max_rect().center(),
+        14.0,
+        egui::Stroke::new(3.0, ui.visuals().widgets.inactive.bg_fill),
+    );
+}
diff --git a/libs/client_lib/src/ui/overlay_ui.rs b/libs/client_lib/src/ui/overlay_ui.rs
index 805f725d..2226869e 100644
--- a/libs/client_lib/src/ui/overlay_ui.rs
+++ b/libs/client_lib/src/ui/overlay_ui.rs
@@ -1,7 +1,19 @@
-use crate::net::ServerToConnect;
-use bevy::ecs::system::{Res, ResMut};
+use crate::{
+    net::ServerToConnect,
+    ui::widgets::list_menu::{button_panel, PanelButton},
+};
+use bevy::{
+    ecs::system::{Res, ResMut},
+    log,
+    prelude::Commands,
+};
 use bevy_egui::{egui, EguiContext};
-use mr_shared_lib::net::{ConnectionState, ConnectionStatus};
+use iyes_loopless::state::{CurrentState, NextState};
+use mr_shared_lib::{
+    messages::DisconnectReason,
+    net::{ConnectionState, ConnectionStatus},
+    AppState, GameSessionState,
+};
 
 pub fn app_loading_ui(mut egui_context: ResMut<EguiContext>) {
     let window_width = 400.0;
@@ -38,9 +50,11 @@ pub fn app_loading_ui(mut egui_context: ResMut<EguiContext>) {
 }
 
 pub fn connection_status_overlay_system(
+    mut commands: Commands,
+    game_session_state: Res<CurrentState<GameSessionState>>,
     mut egui_context: ResMut<EguiContext>,
-    connection_state: Res<ConnectionState>,
-    server_to_connect: Res<ServerToConnect>,
+    mut connection_state: ResMut<ConnectionState>,
+    mut server_to_connect: ResMut<ServerToConnect>,
 ) {
     #[cfg(feature = "profiler")]
     puffin::profile_function!();
@@ -48,7 +62,12 @@ pub fn connection_status_overlay_system(
         connection_state.status(),
         ConnectionStatus::Uninitialized | ConnectionStatus::Connected
     ) && server_to_connect.is_none()
+        && game_session_state.0 != GameSessionState::Paused
     {
+        // We don't display the overlay if we haven't even started connecting or the
+        // connection is ok. We do want to show it when we have a server to
+        // connect or we didn't have any updates from the server for a while (to let a
+        // player disconnect).
         return;
     }
 
@@ -67,9 +86,50 @@ pub fn connection_status_overlay_system(
                 .fixed_size(egui::Vec2::new(window_width, window_height))
                 .show(ui.ctx(), |ui| {
                     ui.centered_and_justified(|ui| {
+                        let text = match (&game_session_state.0, connection_state.status()) {
+                            (GameSessionState::Paused, _) => "No updates from the server...",
+                            (
+                                _,
+                                ConnectionStatus::Uninitialized | ConnectionStatus::Initialized,
+                            ) => "Connecting...",
+                            (
+                                _,
+                                ConnectionStatus::Connecting
+                                | ConnectionStatus::Handshaking
+                                | ConnectionStatus::Connected,
+                            ) => "Handshaking...",
+                            (
+                                _,
+                                ConnectionStatus::Disconnecting(_) | ConnectionStatus::Disconnected,
+                            ) => "Disconnected",
+                        };
+
                         ui.style_mut().override_text_style = Some(egui::TextStyle::Heading);
-                        ui.label(format!("{:?}", connection_state.status()));
+                        ui.label(text);
                     });
+
+                    let button_label = if game_session_state.0 == GameSessionState::Paused {
+                        "Disconnect"
+                    } else {
+                        "Cancel"
+                    };
+                    let [response] = button_panel(
+                        ui,
+                        100.0,
+                        [PanelButton::new(egui::Button::new(button_label))],
+                    );
+                    if response.clicked() {
+                        **server_to_connect = None;
+                        connection_state
+                            .set_status(ConnectionStatus::Disconnecting(DisconnectReason::Aborted));
+                        log::info!("Changing the app state to {:?}", AppState::MainMenu);
+                        commands.insert_resource(NextState(AppState::MainMenu));
+                        log::info!(
+                            "Changing the game session state to {:?}",
+                            GameSessionState::Loading
+                        );
+                        commands.insert_resource(NextState(GameSessionState::Loading));
+                    }
                 });
         });
 }
diff --git a/libs/client_lib/src/ui/widgets/list_menu.rs b/libs/client_lib/src/ui/widgets/list_menu.rs
index 19b3266d..24778993 100644
--- a/libs/client_lib/src/ui/widgets/list_menu.rs
+++ b/libs/client_lib/src/ui/widgets/list_menu.rs
@@ -7,6 +7,7 @@ pub struct MenuListItem<Secondary, Collapsing> {
     title: String,
     id: egui::Id,
     is_selected: bool,
+    is_hoverable: bool,
     image_widget: Option<Box<UiFunc>>,
     secondary: Secondary,
     collapsing: Collapsing,
@@ -41,6 +42,7 @@ impl MenuListItem<DrawNothing, DrawNothing> {
             title: title.to_string(),
             id: egui::Id::new(title.to_string()),
             is_selected: false,
+            is_hoverable: true,
             image_widget: None,
             secondary: |_| {},
             collapsing: |_| {},
@@ -66,6 +68,12 @@ where
         self
     }
 
+    #[allow(dead_code)]
+    pub fn hoverable(mut self, is_hoverable: bool) -> Self {
+        self.is_hoverable = is_hoverable;
+        self
+    }
+
     pub fn image_widget(mut self, image_widget: impl FnOnce(&mut egui::Ui) + 'static) -> Self {
         self.image_widget = Some(Box::new(image_widget));
         self
@@ -79,6 +87,7 @@ where
             title: self.title,
             id: self.id,
             is_selected: self.is_selected,
+            is_hoverable: self.is_hoverable,
             image_widget: self.image_widget,
             secondary: widget,
             collapsing: self.collapsing,
@@ -93,6 +102,7 @@ where
             title: self.title,
             id: self.id,
             is_selected: self.is_selected,
+            is_hoverable: self.is_hoverable,
             image_widget: self.image_widget,
             secondary: self.secondary,
             collapsing: widget,
@@ -111,7 +121,7 @@ where
 
         let fill = if self.is_selected {
             Some(ui.style().visuals.extreme_bg_color)
-        } else if response.hovered() {
+        } else if self.is_hoverable && response.hovered() {
             Some(ui.style().visuals.faint_bg_color)
         } else {
             Some(ui.style().visuals.window_fill())
@@ -158,6 +168,7 @@ where
         secondary_ui.style_mut().override_text_style = Some(egui::TextStyle::Heading);
         secondary_ui.label(self.title);
         secondary_ui.style_mut().override_text_style = None;
+        secondary_ui.add_space(3.0);
         let secondary = (self.secondary)(&mut secondary_ui);
 
         let mut collapsing_ui = ui.child_ui(
@@ -212,7 +223,10 @@ where
         };
 
         let mut ctx_output = ui.ctx().output();
-        if response.hovered() && ctx_output.cursor_icon == egui::CursorIcon::Default {
+        if self.is_hoverable
+            && response.hovered()
+            && ctx_output.cursor_icon == egui::CursorIcon::Default
+        {
             ctx_output.cursor_icon = egui::CursorIcon::PointingHand;
         }
 
diff --git a/libs/shared_lib/src/messages.rs b/libs/shared_lib/src/messages.rs
index ca59ff28..e4eca053 100644
--- a/libs/shared_lib/src/messages.rs
+++ b/libs/shared_lib/src/messages.rs
@@ -138,6 +138,7 @@ pub enum DisconnectReason {
     InvalidUpdate,
     Timeout,
     Closed,
+    Aborted,
 }
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)]