Fixed all padding issues

Closes #64