Improve rendering table in calendar