Added if(cell == nil) test to cellForRow