Major Control Panel update

Major update with fixes and changed UI