Worked out some bugs and added table visibility's