Modifying value calculation and making track clickable