Modular Main Pages - fix rearrange tracking