Improoved layouts