This is the start of the template rework. Each model can be migrated to the new templates without breaking ones still on the legacy layout See: #38