Bug-Fix / Control Panel Updates