Added support for touch screens