Refactor styles adding nesting