Merge jow's search ui with my changes ( complete)