fix overflow content padding
fix demo images
Merge branch 'master' into gh-pages