improve ui and fix minor bug