More rearranging
Revert "More rearranging"

This reverts commit 84c37af80ab34deb108dc23bc777546e714a4866.
More rearranging
Trying to clean up client menu / game loop
Split showing of main "menu" into its own function