Fixed spacing on the bottom of the pages.
Fixed merge conflict