Fix bug with popups
Update simple form compatibility