Updated tracking UI Code