Change CSS names to dashes.
Pushed some of the view logic into the model.