Assessment calendar improvements