Cleaned up contorl pannel