improoved layouts