Rearanged templates so that they are added to the angular template cache
in the correction location.