Layout is now used, however wrongly. See @todo in code
Hotfix for Layout usage. Please see @todo in code where code has to be improved / generalised