Issues necessary to complete the unification of the two pages.

Not including new contents.