code optimization in GUI
Merge branch 'nando'