Diff auto popup

Adds effects of #75 to master that went missing while merging #73