ListView/Popup fixes