Categories design improvements