improve tracking
isolate theme
isolate landing 2 and refactor js