Updated control-panel