Cleanup of layout.xsl
Fixes #28