Improved calendar and timeline