Working on #756 Remove Hardcoded HTML
Fixed bug in calendar.php