Worked on layout a bit.