bug fix & use rider-ui