Remove old model functions
Introduce template layouts