CSS work, and models cleanup