Rearranged article entry's optional fields
Rearranged book entry's optional fields