Did a lot of cleaning up. Layout is getting there.