Consolidating more styles to streamline the css