Fixed max number of cells
Fixed imageView cell constraints in storyboard
Merge branch 'feature/dan/bug-fixes' into develop