Worked on initial layout some more