Remove search engine labels and use graphic instead.

Also some script re-org.