structure improvements regarding touch and pagination