Fixes #190 and #191 by fixing some issues with the hover popup