Various improvements for a show, improvements to mapping dialog