some bug fixed and style added