Applied new style changes