Solution sender, refactor action listener