improved layouts