fix enable/disable touch events
fix enable/disable events
update layout