Calendar view. Small form fixes.