fix some bug after merge stylesheet