Added columns for Academic Organization and Discipline;
Changed format of the columns to allow the newly added columns to
display correctly