Small layout updates
Merge pull request #43 from pajcho/development

Small layout updates