Refactoring: configuration blocks turned into Controls