Worked on basic layout some more