Improve fit track to screen and auto return functionality