Code style fixes for layouts