Improved calendar ui