change the order of sections, some bug fixed
merge
merge
merge
merge
merge