Worked on Comments UI