Fixed touch screen issues