Integration Step 2

@ngoc can you modify your calendar view a little bit?