Made calendar a little better