Correcting indentation

O.o
More refactoring of view HTML into subtemplates