Display Map Controls (Some(-One)), Fixes And More...