Completely reworked the CMS Tool dialog