Fix images and styles in Online Demo
Merge remote-tracking branch 'origin/4.0-release' into 4.0-release