Fix popups
Events highlighting. Closes #26