Worked on the categoryviews
Merge