Fixed Layout Syntax Errors

Now compiles
Merge remote-tracking branch 'origin/master' into filters