progress on layouts