wx GUI: rename class
wx GUI: Improve code