Fix calendar & update url