Layout changes and unencoding of SAML token