Add support for individual line layout.  Not clean yet.