Added ability to define number of views per cell