Fix some bug and Modify some css