Court of Appeal redraws rules on design and trademark rights