Preview icon render fix

- Fixes #5254
- Changes organ render list to a structured list so we can control the render order
Merge pull request #5324 from Loganbacca/bayfix

Preview icon render fix