ux updated & add category support