remove popover temporaly, add bug fix for touch device