v2 new layout templates
todo files, changed layout