Control panel refactorings.