Doing some work to separate layout styles out from style styles in components