Reorganized layout definitions.
Began testing/fixing layout with NoWrap.