Added : better GUI + Dynamic Search on change