Finally working calendar, adding/editting