Improvements to display
Merge pull request #414 from timschofield/develop

Improvements to display