some bug and some ui change