Layout: Minor fixes.
* Also addresses gh-29.
Merge pull request #33 from am11/master

Layout: Minor fixes