update touch logic

update touch logic
update test layout