fix category page
category updates
Merge branch 'develop'