Reorganise screen to make more informative
Merge pull request #544 from timschofield/develop

Reorganise screen to make more informative