Finalize figure formatting for figures 3-5

Addresses the remainder of #82.