category view update
Merge branch 'work'