Much more work on the layout.
Merge pull request #19 from robertbrockie/misc

Much more work on the layout.