include tracking on subpages, minor display tweaks