Refactoring recursive layouts.  Intermediate commit to test on iPhone