code cleaning
corrected search Encoding
harmonized widgets structure