Improve ui and add multi search