CMS-1183: Live Edit - Improvements to toolbar