clean up layouts, commit new items