rework on the layouts