added analytics tracking and removed extra navigation loading