one listener class for both control tables
small ui improvments