Repair some bugs, Beautify the ui