Changes to control panel app