initial row level view, also swc-1336 and swc-1338
swc-1265 - single row view
merge upstream 40
code review changes
Merge pull request #942 from dburdick/swc-1069

Swc 1265, 1336 1338