Adding NivelModel and template tweaks