Clarifies height/width & padding interaction
Finalize padding fixes
Merge branch 'cleanup'