Control panel design refactoring.