Calendar fix, JS script fix