merge padding updates from gh-pages