lots of updates to Layout2