- Calendar height fixed
- Settings checkboxes changed to buttons
Merge origin/master