[TASK] Improve CmsLayout

Change-Id: I2b626108cad526f80978ce01fa93b8ae144225bd
Reviewed-on: https://review.typo3.org/28136
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer