Simplified Control Panel layout; cleanup of unreleased interface changes