Fixing row cutoff
Merge branch 'develop'