lots of progress on the layout