Added analytics, changed layouts