Some changes
Fixed contraints
Modified calendar view
Modified calendar view
Modified calendar view