added calendar interface
Fixed some formatting