- correct the size on side elements
Merge branch 'master' into rel_1_0