More figure edits