Small layout improvements
Merge pull request #296 from timschofield/develop

Small layout improvements