Minor layout fixes

Issue #106