round 1 of new layout work.
round 1 of new layout work.