Fixed the popup windows to more closely relate between the two platforms