TableGUI cleanup 2

more cleanup