Fixes Popup
Adds osx version