Changes to control panel and descriptions.
Merge branch 'kyle'