Add location, Fix calendar html.