CMS tooltip system update