Fix height bug
Merge branch 'master' into content