Added custom search along with small ui changes