Padding Fixes

Made padding a little less resolution dependent and fixed a whoopsie.