layout updates to EOPAS
Merge branch 'v1.2_dev' of github.com:IntersectAustralia/hcsvlab into v1.2_dev