Worked on comments and gallery