Fixed syntax error on layout manager
Merge branch 'diego'