Layout: Minor fixes

* Also addresses gh-29.