Made some changes to the select popup