Fix height bug
Merge branch content