fixed merging errors
updates  on several pages
display order