Layout, minor edits.