Small layout changes and code cleanups
Further manual improvements
Merge pull request #293 from timschofield/develop

Develop