Simplified mexico form
Added better select for new sources