Fixing panel_control (Work in progress)