Feature/fix calendar this week