re #878 - Improved static content