Added double column organization for subjects and categories.