Cleaning up; more work on control_panel