Thumbnail popup position tweaks and delete logic tweak