Added support for touch screens and close icon