Fixing all Layout linting warning/errors