fix bug & clean UI