updated template naming and layout