Added templates
Added layout