Added subjects, reduced wrapper width