Add usable popovers. Clean code a bit.