Fixing calendar whitespace and padding. Closes #3, closes #4