Model fixes
View templates