add tracking and back button