More layout simplifications.
Redo text for broken-docs