Analytics
Minor design changes