Moved user html into a script
Merging branch - Tahsa template additions