Major changes to calendar view and json request