Updated for Universal layout support
Finished Bronze and chapter 17