Added TouchEvent (for tablet)
Fixed UI