Map and gui fix