Updating invalid markup

Used WebMatrix built in site scanner to check for invalid markup. I also
renamed the old calendar code to our normal naming convention.