Fix touch screen controls, Fixes 2789