Fit track to screen issues fix