Small changes on template files.
* Remove TAB
* Remove incesary changes