GPII-153, GPII-187: decorators to subcomponents

Renderer Fluid component decorators are not allowed for sub panels. These have been replaced by using subcomponents instead.