fix layouts/analytics