Added table-cell version of layout, and changed order a bit