Work on styling issues