FC-1908 category ui refactor