padding and button fixes
Merge pull request #1 from adispen/master

padding and button fixes