Make gametype/map switching a bit more reliable
Make it look good