modify ui and fix bug