Worked on #3 and general layout changes.