updating category display
Merge remote-tracking branch 'origin/Roberto' into Alessandro
finsih category and subcat
Final