Factor templates into their own module for easier passing to other templates
Tidied up outer container class name
Tidying up sub-groups on service page