Small layout changes
Merge pull request #24 from pajcho/development

Small layout changes