support for touch and mobile reworked