Added fit selectors for popups and other stuff