Little modifications for the popup user