refactoring gui.Listeners part2