FLUID-5200, FLUID-5201, FLUID-5202: composite panel issues

http://issues.fluidproject.org/browse/FLUID-5200
http://issues.fluidproject.org/browse/FLUID-5201
http://issues.fluidproject.org/browse/FLUID-5202