unify all the pages.
Merging branch-.-