Fix for the layout problems.
Merge remote-tracking branch 'origin/master' into layout_fix