More updates to how the base control panel and data panel function.