committed my chat screen changes and Sandeep's calendar changes