Revert "XML"

This reverts commit 753fb8078dea7b078645a4a2d5f0a2c131b9cc7e.
Popup fixed