Made some padding changes
Merged lakepark branch, I hope I get this right this time???