Facility view improvements

This follows on from closed pull request #352, but is branched.