Make calendar more dynamic