Updated tracking on whole site
Minor design tweaks