Fixes #1256, adds better handling of settings.popup, and fluid