fix bugs && change a ui