Padding changes, finished solutions page
merge conflict