improve ui and bug fix