Refactor styling in progress