Changed html comment to django comment and fixed spacing in files [MJ-306]
fixed bug, extends always at top of file* [MJ-306]