fixes #2 ,performance tuning, added icons