Fix resizing page
Merge branch 'develop'