Improve table's render in calendar