Adjust the top & bottom padding and vertical alignment

Fixes #15 & #16