Adds htmlangular checks, moves templates around a bit