Revert 50fe5ea..b2f0e7c

This rolls back to commit 50fe5ea13cff0e2937c238f35df14f9f44f0e27d.
broken looped world and mostly working menu