new layout & moved system templates