Improved calendar DOM