Reworked popup-system
Improved marker addition