Update images to current UI and best practice
Authored by: johnhartman 2015-10-23
Parent: [r1005]
Child: [r1007]