@jpasqua feedback along with some escaping errors in includes

Escapes & correctly in &lt;
Rename and better formatting