Cleanup whitepsace
Adding new html templates
Finishing dom elements