got a lot of the layout work finished