Fix bug preventing the pandl flag being shown correctly on edit
Improve screen layout, and some code formatting changes
Code formatting changes
Merge pull request #274 from timschofield/develop

Develop