Search implemented. Some UI improvements.