FLUID-4824: First working refactoring of controls to make captions and full-screen optional, added through demands.