Modular Main Pages - rearrange tracking