Merge pull request #1041 from jay-hodgson/release-48

Merge to release-48
using display style directly instead of css
make hide/show subpages safe