Added new category picker implementation