Fixed a few issues with Popup