Add search capability, update ui