Fixed weird stretching of elements on short pages
Merge branch 'master' into webapi