Fixes
Calendar not pretty enough