Added templates and layout