Slight change in order for tracking view URLs and update tracking code format