Fix some bug and modify css