Fix and work on Control Panel