Edit Control Panel templates
Merge back to master