GUI code cleaning
GUI code cleaning ...