modify some UI, fix bugs