Fix for #354, and some other minor formatting/layout changes.
Merge pull request #357 from aodn/issue_354

Fix for #354, and some other minor formatting/layout changes.