Code style updates
Updated layouts submodule