Remove Org listing and Fix table header display