Refactor some styling to stylesheet