Refactoring the TOC data structures and layouts.  Intermediate commit to test on iPhone.