Some markup changes and allowing model methods to set classes
Resolve a conflict