Updated template title
Added point 1 and squashed in point 2
edited with rebase. fixed ul closing tag
Merge