Improved UI for switching maps