fixed a bug with the info_popups and did some refactoring there