Re-design

One-day code session. Finished 3 of 6 sections. The others should be
pretty simple.