Includes problematic add_page issue unresolved.
Fixed add_page.