Expanded template

Included tags for all necessary elements