Master

Pushing padding and wrapping changes to gh-pages