Now without merge conflicts with tracking.

Refactored to make page buttons into a macro.