Add popup
Small fixes