fix several styling issues