Feature/popover button

I'll merge it, since I already reviewed it (and Brad)