Navigation loop updated to pull in custom pages