Control Panel: refactoring of design/content page controller