Simple search implemented.  UI cleanup.