Fix a little Layout bug
Merge origin/master