fixbug & optimize code for hinhanh page