Fixed some form and xsl issues