Header and calendar aprovements