Better management of the layouts