More work on XSL template