Added table header view, restructured classes