Add analytics tracking code
Minor design changes