extra space added at the bottom
Merge branch 'spacing-changes' into develop