changed dir structure/header popover cancel hack