Added calendar delayed load, fixed add/edit save