GTAU-9115

- Updated templates so that they share the same markup.