This layout is pretty good.  Bug fixed ...??
Fiddled with DB.  Hope I didn't break anything.