re #878 - Improved static content
re #919 - Improved UX, naming things is the hardest...
Merge branch 'master' into staging