Support CMSMS 1.11.x,1.12.x,2+
UI tweaks
Minor bugfixes