Bug fix for missing row that occurred when container view was displayed.  Also fixes the index out of range bug.