some more work to the layouts