Fixing errors and increasing the z-index of the user-selection popup