Major layout revision, plus big fixes.
Merge