Cleaned handling of control panel widgets