Style updates, cleanup
Dynamic index wrap code
Initial slides for Scenario 3