Feature/popover button

I'll auto merge it (Brad reviewed it, and I reviewed his work)