New analytics tracking and some layout cleanup