Minor layout changes
Merge pull request #45 from fabaff/dev

Minor layout changes