Reshuffle table laying code.
Clean up collections a bit.
Start of a web UI.