diff --git a/applyXSL/urls.py b/applyXSL/urls.py
index 91e783f..60362f6 100644
--- a/applyXSL/urls.py
+++ b/applyXSL/urls.py
@@ -1,10 +1,7 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url
 from django.views.generic import TemplateView
 
-urlpatterns = patterns('',
-    url(r'^$', TemplateView.as_view(template_name='homepage.html'), name="home"),
-)
-
+from . import views
 from django.conf import settings
 
 class CapabilitiesView(TemplateView):
@@ -16,10 +13,11 @@ def get_context_data(self, **kwargs):
 
 
 
-urlpatterns = patterns('applyXSL.views',
-    (r'^(?P<xsl>\w+)/$', 'showForm'),
-    (r'^(?P<xsl>\w+)/service$', 'receiveInput'),
-    (r'^(?P<xsl>\w+)/result/(?P<rid>\w+)$', 'deliverResult'),
-    (r'^(?P<xsl>\w+)/availability$', TemplateView.as_view(template_name='availability.xml')),
+urlpatterns = [
+    url(r'^$', TemplateView.as_view(template_name='index.html'), name="home"),
+    url(r'^(?P<xsl>\w+)/$', views.showForm),
+    url(r'^(?P<xsl>\w+)/service$', views.receiveInput),
+    url(r'^(?P<xsl>\w+)/result/(?P<rid>\w+)$', views.deliverResult),
+    url(r'^(?P<xsl>\w+)/availability$', TemplateView.as_view(template_name='availability.xml')),
     url(r'^(?P<xsl>\w+)/capabilities$', CapabilitiesView.as_view()),
-    )
+]
diff --git a/applyXSL/views.py b/applyXSL/views.py
index 322efa2..1b83310 100644
--- a/applyXSL/views.py
+++ b/applyXSL/views.py
@@ -1,38 +1,29 @@
 # -*- coding: utf-8 -*-
 
-from django.shortcuts import render,render_to_response, get_object_or_404
+from django.shortcuts import render,get_object_or_404
 from django.template import RequestContext
 from django.http import HttpResponseRedirect, HttpResponse, HttpResponseNotFound
 from django.forms import Form,FileField,URLField,TextInput
 from django.core.exceptions import ValidationError
 
 from lxml import etree as e
-from urllib2 import urlopen
+from urllib.request import urlopen
 import os
 import threading
 from time import sleep
+from . import xsl
 
+from . import models
 
 from django.conf import settings
-STATIC=settings.STATIC_DIR
-if hasattr(settings,'DEPLOY_URL'):
-    APPURL = settings.DEPLOY_URL+'applyXSL/'
-else:
-    APPURL = '/applyXSL/'
-
-
-if hasattr(settings,'SAXON_JAR'):
-    import xsl
-    useJAVAxsl = True
-else: useJAVAxsl = False
 
-from models import Conversion
+STATIC=settings.STATIC_DIR
 XSL_MIME = {'xsams2sme':'text/plain',
             'linespec':'image/svg+xml',
             'atomicxsams2html':'text/html',
             'molecularxsams2html':'text/html',
             'collisions2html':'text/html',}
-
+            
 XSL_VERSION = {'xsams2sme':1,
             'linespec':1,
             'atomicxsams2html':1,
@@ -42,7 +33,7 @@
 class ConversionForm(Form):
     upload = FileField(label='Input file',required=False)
     url = URLField(label='Input URL',required=False,widget=TextInput(attrs={'size': 50, 'title': 'Paste here a URL that delivers an XSAMS document.',}))
-
+    
     def clean(self):
         upload = self.cleaned_data.get('upload')
 
@@ -56,61 +47,31 @@ def showForm(request,xsl):
     if xsl not in XSL_MIME:
         return HttpResponseNotFound()
     ConvForm = ConversionForm()
-    return render_to_response('applyXSL.html',
-            RequestContext(request,dict(conversion=ConvForm)))
-
-def transformJAVA(conv,err=None):
-    transformer = xsl.XslTransformerFactory.getXslTransformer(XSL_VERSION[conv.xsl])
-    try:
-        result = transformer.transform(conv)
-    except:
-        err = '500 transformation failed\n'
-        result = None
-    return err,result
-
-
-def transformLXML(conv,err=None):
-    xslfile = open(STATIC+'/xsl/%s.xsl'%conv.xsl)
-    xsl = e.XSLT(e.parse(xslfile))
-    try:
-        if conv.url:
-            xml = e.parse(urlopen(conv.url))
-        elif conv.upload:
-            xml = e.parse(conv.upload)
-        else:
-            err = '400 no data to transform\n'
-    except:
-        err = '400 input data seems to be broken XML\n'
-
-    try:
-        output = str(xsl(xml))
-    except:
-            err = '500 transformation failed\n'
-            output=None
-    return err,output
+    return render(request, 'applyXSL.html',dict(conversion=ConvForm))
 
 class DoWork(threading.Thread):
     def __init__(self, conv):
         threading.Thread.__init__(self)
         self.conv = conv
         self.outfile = STATIC+'/results/%s'%conv.pk
-
+        self.err = ''
+        
     def run(self):
-        if useJAVAxsl:
-            err,result = transformJAVA(self.conv)
-        else:
-            err,result = transformLXML(self.conv)
-
-        if err:
-            open(self.outfile+'.err','w').write(err)
-        else:
-            open(self.outfile,'w').write(result)
-
+      transformer = xsl.XslTransformerFactory.getXslTransformer(XSL_VERSION[self.conv.xsl])
+      result = transformer.transform(self.conv)
+      
+      try : 
+        open(self.outfile,'w').write(result)
+      except Exception as exc:
+        open(self.outfile,'w').write(str(exc))
+        
 
 def receiveInput(request,xsl):
+    print(dir(request))
     ConvForm = ConversionForm(request.POST, request.FILES)
+
     if ConvForm.is_valid():
-        conv = Conversion(xsl=xsl,
+        conv = models.Conversion(xsl=xsl,
                    upload=ConvForm.cleaned_data['upload'],
                    url=ConvForm.cleaned_data['url'] )
         conv.save(force_insert=True)
@@ -121,19 +82,19 @@ def receiveInput(request,xsl):
         # give it a second, so we might skip the
         # waiting-page for quick transforms
         sleep(2)
-        return HttpResponseRedirect(APPURL+'%s/result/%s'%(xsl,conv.pk))
+        return HttpResponseRedirect(settings.DEPLOY_URL+'applyXSL/%s/result/%s'%(xsl,conv.pk))
     else:
-        return HttpResponseRedirect(APPURL+'%s/'%xsl)
+        return HttpResponseRedirect(settings.DEPLOY_URL+'applyXSL/%s/'%xsl)
 
 def deliverResult(request,xsl,rid):
-    conv = get_object_or_404(Conversion,pk=rid)
+    conv = get_object_or_404(models.Conversion,pk=rid)
     outfile = STATIC+'/results/%s'%rid
 
     if os.path.exists(outfile+'.err'):
-        errstring = open(outfile+'.err').readline()
-        errcode, msg = errstring.split(' ',1)
+        errcode, msg = open(outfile+'.err').readline().split(' ',1)
         return HttpResponse(msg,status=errcode,content_type='text/plain')
     elif os.path.exists(outfile):
         return HttpResponse(open(outfile),content_type=XSL_MIME.get(xsl,'text/plain'))
     else:
         return HttpResponse(render(request,'wait5.html',{}),status=202)
+
diff --git a/applyXSL/xsl.py b/applyXSL/xsl.py
index e0d007e..babfe72 100644
--- a/applyXSL/xsl.py
+++ b/applyXSL/xsl.py
@@ -2,8 +2,8 @@
 from abc import ABCMeta, abstractmethod
 from lxml import etree as e
 from django.conf import settings
-import commands
-from urllib2 import urlopen
+import subprocess
+from urllib.request import urlopen
 import tempfile
 
 STATIC=settings.STATIC_DIR
@@ -32,22 +32,23 @@ def __init__(self):
 
   def transform(self, form):
     xslfile = STATIC+'/xsl/%s.xsl'%form.xsl
+    import os.path
     try:
         if form.url:
-          command = 'java -jar '+SAXON_JAR+' -s:"%s" -xsl:%s'%(form.url, xslfile)      
-          output = commands.getoutput(command)
+          command = ['java', '-jar', SAXON_JAR, '-s:"{form.url}"'.format(form.url),  '-xsl:{}'.format(xslfile)]
+          output = subprocess.check_output(' '.join(command), encoding="UTF-8")
         elif form.upload:
-          tmpfile = tempfile.NamedTemporaryFile(delete=False)
-          xml = e.tostring(e.parse(form.upload))
-          tmpfile.write(xml)
-          tmpfile.flush()   # be sure that all data have been written 
-          command = 'java -jar '+SAXON_JAR+' -s:"%s" -xsl:%s'%(tmp.name, xslfile)      
-          output = commands.getoutput(command)
+          with tempfile.NamedTemporaryFile(delete=True) as tmpfile:
+            xml = e.tostring(e.parse(form.upload))
+            tmpfile.write(xml)
+            tmpfile.flush()   # be sure that all data have been written 
+            command = ['java', '-jar', SAXON_JAR, '-s:%s'%(tmpfile.name),  '-xsl:{}'.format(xslfile)]
+            output = subprocess.check_output(command, encoding="UTF-8")
         else:
             self.err = '400 no data to transform\n'
-    except Exception, exc:
+    except Exception as exc:
         self.err = '400 input data seems to be broken XML\n'
-        print exc
+        print(exc)
     
     if self.err:
         return self.err
@@ -71,9 +72,9 @@ def transform(self, form):
           xml = e.parse(form.upload)
         else:
           self.err = '400 no data to transform\n'
-    except Exception, exc:
+    except Exception as exc:
         self.err = '400 input data seems to be broken XML\n'
-        print exc
+        print(exc)
 
     try:
         output = str(xsl(xml))
diff --git a/processors/urls.py b/processors/urls.py
index 1be89b3..7e85225 100644
--- a/processors/urls.py
+++ b/processors/urls.py
@@ -1,12 +1,7 @@
-from django.conf.urls import patterns, include, url
-#from django.contrib import admin
-
-urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'processors.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
-    # url(r'^admin/', include(admin.site.urls)),
+from django.conf.urls import url, include
 
+urlpatterns = [
     url(r'^applyXSL/', include('applyXSL.urls')),
     url(r'^specsynth/', include('specsynth.urls')),
-)
+]
+
diff --git a/specsynth/urls.py b/specsynth/urls.py
index 0827af8..a725d2d 100644
--- a/specsynth/urls.py
+++ b/specsynth/urls.py
@@ -1,9 +1,13 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import url, include
 
-urlpatterns = patterns('specsynth.views',
-    (r'^$', 'showForm'),
-    (r'service$', 'receiveInput'),
-    (r'result/spec_(?P<rid>\w+).json$', 'deliverResult'),
+from specsynth import views
+
+urlpatterns = [
+    url(r'^$', views.showForm),
+    url(r'service$', views.receiveInput),
+    url(r'result/spec_(?P<rid>\w+).json$', views.deliverResult),
     #(r'^(?P<xsl>\w+)/availability$', direct_to_template, {'template':'availability.xml','extra_context':{'deployurl':settings.DEPLOY_URL}}),
     #(r'^(?P<xsl>\w+)/capabilities$', direct_to_template, {'template':'capabilities.xml','extra_context':{'deployurl':settings.DEPLOY_URL}})
-    )
+    
+]
+
diff --git a/specsynth/views.py b/specsynth/views.py
index 1135c5c..c3e1204 100644
--- a/specsynth/views.py
+++ b/specsynth/views.py
@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from django.shortcuts import render,render_to_response, get_object_or_404
-from django.template import RequestContext
-from django.http import HttpResponseRedirect, HttpResponse, HttpResponseNotFound
+from django.shortcuts import render,get_object_or_404
+from django.http import HttpResponseRedirect, HttpResponse
 from django.forms import Form,FileField,URLField,TextInput
 from django.core.exceptions import ValidationError
 
 from lxml import etree as e
-from urllib2 import urlopen
+from urllib.request import urlopen
 import os
 import threading
 from time import sleep
 import json
-from models import Spec
+from .models import Spec
 
 from django.conf import settings
 STATIC = settings.STATIC_DIR
@@ -49,8 +48,8 @@ def clean(self):
 
 def showForm(request):
     ConvForm = ConversionForm()
-    return render_to_response('specsynth.html',
-            RequestContext(request,dict(conversion=ConvForm)))
+    return render(request, 'specsynth.html',
+            dict(conversion=ConvForm))
 
 class DoWork(threading.Thread):
     def __init__(self,conv):
@@ -70,8 +69,8 @@ def run(self):
             self.err += '400 input data seems to be broken XML\n'
         try:
             output = prepare_json(xml)
-        except Exception, E:
-            print E
+        except Exception as exc:
+            print(exc)
             self.err += '500 transformation failed\n'
 
         if self.err:
diff --git a/static/vamdc_files/style.css b/static/vamdc_files/style.css
index b2d2e1d..b39c033 100644
--- a/static/vamdc_files/style.css
+++ b/static/vamdc_files/style.css
@@ -145,20 +145,28 @@ a {
     float: left;
 }
 .main-content-1 {
-    width: 880px;
+    width: 70%;
     float: left;
     position: relative;
 }
 .main-content-2 {
-    width: 732px;
+    width: 70%;
     float: left;
 }
 .main-content-full {
-    width: 100%}
+    width: 100%
+}
+
 .sidebar-right {
-    width: 210px;
+    width: 20%;
     float: right;
 }
+
+.sidebar-right ul{
+    margin-bottom: 1em;
+    list-style:none;
+}
+
 .top-bar {
     zoom: 1;
     width: 100%}
diff --git a/static/xsl/atomicxsams2html.xsl b/static/xsl/atomicxsams2html.xsl
index 2ec95bd..7fad85f 100644
--- a/static/xsl/atomicxsams2html.xsl
+++ b/static/xsl/atomicxsams2html.xsl
@@ -1,703 +1,327 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:xsams="http://vamdc.org/xml/xsams/1.0">
     
-    <xsl:output method="html" indent="no"/>
-    <xsl:strip-space elements="*"/>
-    
-    <xsl:decimal-format name="fixnan" NaN="" />
-    
-    <xsl:key name="atomicState" match="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState" use="@stateID"/>
-    
-    <!-- name of queried node -->
-    <xsl:variable name="requestedNode" select="/xsams:XSAMSData/xsams:Sources/xsams:Source/xsams:Comments[contains(.,'is a self-reference')]/../@sourceID" />
-    
-    <!-- test if node exists or not to hide unwanted columns -->
-    <xsl:variable name="stateRefCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:SourceRef)" />
-    <xsl:variable name="radiativeTransitionRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:SourceRef)" />
-    <xsl:variable name="wavelengthRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength/xsams:SourceRef)" />    
-    <xsl:variable name="wavenumberCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavenumber)" />
-    <xsl:variable name="energyCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Energy)" />
-    <xsl:variable name="frequencyCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Frequency)" />
-    <xsl:variable name="transitionProbabilityCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:TransitionProbabilityA)" />
-    <xsl:variable name="oscillatorStrengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:OscillatorStrength)" />
-    <xsl:variable name="weightedOscillatorStrengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:WeightedOscillatorStrength)" />
-    <xsl:variable name="log10WeightedOscillatorStrengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:Log10WeightedOscillatorStrength)" />      
-    <xsl:variable name="stateDescriptionCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:Description)" />
-    <xsl:variable name="stateEnergyCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:StateEnergy)" />
-    <xsl:variable name="ionizationEnergyCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:IonizationEnergy)" />
-    <xsl:variable name="lifeTimeCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:LifeTime)" />
-    <xsl:variable name="statisticalWeightCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:StatisticalWeight)" />
-    <xsl:variable name="parityCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicQuantumNumbers/xsams:Parity)" />
-    <xsl:variable name="totalAngularMomentumCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicQuantumNumbers/xsams:TotalAngularMomentum)" />
-    <xsl:variable name="kappaCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicQuantumNumbers/xsams:Kappa)" />
-    <xsl:variable name="hyperfineMomentumCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicQuantumNumbers/xsams:HyperfineMomentum)" />
-    <xsl:variable name="magneticQuantumNumberCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicQuantumNumbers/xsams:MagneticQuantumNumber)" />
-    <xsl:variable name="termLabelCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicComposition/xsams:Component/xsams:Term/xsams:TermLabel)" />
-    <xsl:variable name="mixingCoefficientCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicComposition/xsams:Component/xsams:MixingCoefficient)" />
-    <xsl:variable name="configurationLabelCount" select="count(/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicComposition/xsams:Component/xsams:Configuration/xsams:ConfigurationLabel)" />
-    
-    <xsl:variable name="termCouplingCount">      
-      <xsl:choose>
-        <xsl:when test="count(//xsams:LS)&gt;0 or count(//xsams:jj)&gt;0 or count(//xsams:J1J2)&gt;0 or count(//xsams:jK)&gt;0 or count(//xsams:LK)&gt;0">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-   
-    <!-- end tests -->
-    
-    <xsl:variable name="stateEnergyUnit">
-        <xsl:for-each select="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:StateEnergy/xsams:Value/@units">
-            <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
-        </xsl:for-each>
-    </xsl:variable>
-    
-    <xsl:variable name="ionizationEnergyUnit">
-        <xsl:for-each select="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:IonizationEnergy/xsams:Value/@units">
-            <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
-        </xsl:for-each>
-    </xsl:variable>    
-    
-    
-    <xsl:template match="/xsams:XSAMSData">
-        <!--  start html page-->
+	<xsl:output method="html" indent="no"/>
+	<xsl:strip-space elements="*"/>
+
+	<xsl:decimal-format name="fixnan" NaN="" />
+
+	<xsl:key name="atomicState" match="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState" use="@stateID"/>
+	<xsl:key name="molecularState" match="/xsams:XSAMSData/xsams:Species/xsams:Molecules/xsams:Molecule/xsams:MolecularState" use="@stateID"/>
+
+	<xsl:variable name="newline"><xsl:text>
+	</xsl:text></xsl:variable>
+	
+	<xsl:variable name="stateEnergyUnit">
+	 <xsl:for-each select="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:StateEnergy/xsams:Value/@units">
+	   <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+	 </xsl:for-each>
+	</xsl:variable>
+	
+	<xsl:variable name="ionizationEnergyUnit">
+	 <xsl:for-each select="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicNumericalData/xsams:IonizationEnergy/xsams:Value/@units">
+	   <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+	 </xsl:for-each>
+	</xsl:variable>
+	
+	<xsl:variable name="component">
+	 <xsl:for-each select="/xsams:XSAMSData/xsams:Species/xsams:Atoms/xsams:Atom/xsams:Isotope/xsams:Ion/xsams:AtomicState/xsams:AtomicComposition">
+	   <xsl:if test="position()=1"><xsl:value-of select="count(./Component)"/></xsl:if>
+	 </xsl:for-each>
+	</xsl:variable>
+
+    <xsl:template match="/xsams:XSAMSData/xsams:Processes/xsams:Radiative">
+		
+        <!--  start html -->
         <html xmlns="http://www.w3.org/1999/xhtml" lang="EN" dir="ltr">
-            <head>
-                <link rel="stylesheet" href="/css/tablesorter.css" type="text/css" media="print, projection, screen" ></link>
-                <link rel="stylesheet" href="/css/display.css" type="text/css" media="print, projection, screen" ></link>
-            </head>
-            <body>
-                <div id="page_actions">
-                    <fieldset title="Actions">
-                        <legend>Actions</legend>
-                        <button id="reset" >Reset page</button>
-                        <button id="csv_export">Show As Csv</button>
-                        <input type="submit" id="votable_samp" value="Send with samp" />
-                    </fieldset>
-                </div>
-                <div>
-                    <h1>Sources</h1>
-                    <!--sources table -->
-                    <table id="sources" class="tablesorter">
-                        <thead>
-                            <tr>
-                                <th>Id</th>
-                                <th>Title</th>
-                                <th>Origin</th>
-                                <th>Authors</th>
-                                <th>Year</th>
-                                <th>Link</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <xsl:for-each select="/xsams:XSAMSData/xsams:Sources/xsams:Source">
-                                <xsl:call-template name="fillSourcesTable">
-                                    <xsl:with-param name="source" select="."/>
-                                </xsl:call-template>
-                            </xsl:for-each>
-                        </tbody>
-                    </table>
-                </div>
+                <head>
+                        <link rel="stylesheet" href="/css/tablesorter.css" type="text/css" media="print, projection, screen" ></link>
+                        <link rel="stylesheet" href="/css/display.css" type="text/css" media="print, projection, screen" ></link>
+                        <script type="text/javascript" src="/js/jquery.js"></script>
+                        <script type="text/javascript" src="/js/ajax_settings.js"></script>
+                        <script type="text/javascript" src="/js/jquery.tablesorter.min.js"></script>
+                        <script type="text/javascript" src="/js/xsl_transform.js"></script>
+                        <script type="text/javascript" src="/js/samp.js"></script>
+                </head>     
+        <body>
+        <!-- end html -->
+	
+	<xsl:variable name="the_max">
+	 <xsl:for-each select="./xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength/xsams:Value">
+	   <xsl:sort data-type="number" order="descending"/>
+	   <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+	 </xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="the_min">
+	 <xsl:for-each select="./xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength/xsams:Value">
+	   <xsl:sort data-type="number" order="ascending"/>
+	   <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+	 </xsl:for-each>
+	</xsl:variable>
+       
+	<!-- start html -->
+	<!-- table header -->
+    <p>
+        <button id="reset">Reset page</button>
+    </p>
+    <p>
+	<button id="csv_export">Show As Csv</button>
+	</p>   
+    <p>
+        <input type="submit" id="votable_samp" value="Send with samp" />        
+    </p>
+    <div id="loader"> 
+		<img alt="loading" src='/img/loader_anim.gif'></img> <span> Please wait ... </span>
+	</div>
+	<div> 
+		<pre id="result_ascii"></pre>	
+	</div>    
+    <div>
+        <table id="table" class="tablesorter">
+            <thead>
+            <tr>
+                <th id="c1"><span class="title"></span><button id="select_all_lines">Unselect all</button></th>
+                <th id="c2"><span class="title">Spec Ion</span><div class="remove hideable"><button>X</button></div></th>
+		<th id="c3"><span class="title">Mass number</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c4"><span class="title">Wavelength(A)</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c5"><span class="title">Wavenumber</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c6"><span class="title">Energy</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c7"><span class="title">Frequency</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c8"><span class="title">A</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c9"><span class="title">Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c10"><span class="title">Weighted Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>                    
+                <th id="c11"><span class="title">Lower state description</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c12"><span class="title">Lower energy(<xsl:value-of select="$stateEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c13"><span class="title">Lower ionization(<xsl:value-of select="$ionizationEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c14"><span class="title">Lower lifetime</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c15"><span class="title">Lower statistical weight</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c16"><span class="title">Lower parity</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c17"><span class="title">Lower total angular momentum</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c18"><span class="title">Lower kappa</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c19"><span class="title">Lower hyperfine momentum</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c20"><span class="title">Lower magnetic quantum number</span><div class="remove hideable"><button>X</button></div></th>		
+                <th id="c21"><span class="title">Lower mixing coeff</span><div class="remove hideable"><button>X</button></div></th>      
+                <th id="c22"><span class="title">Lower configuration</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c23"><span class="title">Lower term</span><div class="remove hideable"><button>X</button></div></th>   
                 
-                <div id="title">
-                    <h1>Results from <span id="queried_node"><xsl:value-of select="substring(substring-before($requestedNode, '-'), 2)"/></span> VAMDC node</h1>
-                </div>
-                <div id="loader">
-                    <img alt="loading" src='/img/loader_anim.gif'></img> <span> Please wait ... </span>
-                </div>
-                <div>
-                    <!-- ascii export area -->
-                    <pre id="result_ascii"></pre>
-                </div>
-                <div>
-                    <!-- transitions table -->
-                    <table id="transitions" class="tablesorter">
-                        <thead>
-                            <tr>                                
-                                <th id="c1"><span class="title"></span><button id="select_all_lines">Unselect all</button></th>
-                                <th id="c2"><span class="title">Spec Ion</span><div class="remove hideable"><button>X</button></div></th>
-                                <th id="c3"><span class="title">Wavelength(A)</span><div class="remove hideable"><button>X</button></div></th>
-                                
-                                <xsl:if test="$radiativeTransitionRefCount &gt; 0 or $wavelengthRefCount &gt; 0">
-                                    <th id="c4"><span class="title">Transition reference</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$wavenumberCount &gt; 0">
-                                    <th id="c5"><span class="title">Wavenumber</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$energyCount &gt; 0">
-                                    <th id="c6"><span class="title">Energy</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$frequencyCount &gt; 0">
-                                    <th id="c7"><span class="title">Frequency</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$transitionProbabilityCount &gt; 0">
-                                    <th id="c8"><span class="title">A</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$oscillatorStrengthCount &gt; 0">
-                                    <th id="c9"><span class="title">Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>   
-                                
-                                <xsl:if test="$weightedOscillatorStrengthCount &gt; 0">
-                                    <th id="c10"><span class="title">Weighted Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>                                   
-
-                                <xsl:if test="$log10WeightedOscillatorStrengthCount &gt; 0">
-                                    <th id="c11"><span class="title">Log10 Weighted Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>                               
-                                
-                                <xsl:if test="$stateDescriptionCount &gt; 0">
-                                    <th id="c12"><span class="title">Lower state description</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>   
-                                
-                                <xsl:if test="$stateRefCount &gt; 0">
-                                    <th id="c13"><span class="title">Lower state source</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>   
-                                
-                                <xsl:if test="$stateEnergyCount &gt; 0">
-                                    <th id="c14"><span class="title">Lower energy(<xsl:value-of select="$stateEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>   
-                                
-                                <xsl:if test="$ionizationEnergyCount &gt; 0">
-                                    <th id="c15"><span class="title">Lower ionization(<xsl:value-of select="$ionizationEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>   
-                                
-                                <xsl:if test="$lifeTimeCount &gt; 0">
-                                    <th id="c16"><span class="title">Lower lifetime</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>       
-                                
-                                <xsl:if test="$statisticalWeightCount &gt; 0">
-                                    <th id="c17"><span class="title">Lower statistical weight</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>       
-                                
-                                <xsl:if test="$parityCount &gt; 0">
-                                    <th id="c18"><span class="title">Lower parity</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>           
-                                
-                                <xsl:if test="$totalAngularMomentumCount &gt; 0">    
-                                    <th id="c19"><span class="title">Lower total angular momentum</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                
-                                <xsl:if test="$kappaCount &gt; 0">    
-                                    <th id="c20"><span class="title">Lower kappa</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>           
-                                
-                                <xsl:if test="$hyperfineMomentumCount &gt; 0">   
-                                    <th id="c21"><span class="title">Lower hyperfine momentum</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>    
-                                
-                                <xsl:if test="$magneticQuantumNumberCount &gt; 0">
-                                    <th id="c22"><span class="title">Lower magnetic quantum number</span><div class="remove hideable"><button>X</button></div></th>		
-                                </xsl:if>    
-                                
-                                <xsl:if test="$mixingCoefficientCount &gt; 0">
-                                    <th id="c23"><span class="title">Lower mixing coeff</span><div class="remove hideable"><button>X</button></div></th>     
-                                </xsl:if>   
-                                
-                                <xsl:if test="$configurationLabelCount &gt; 0">     
-                                    <th id="c24"><span class="title">Lower configuration</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$termLabelCount &gt; 0">
-                                    <th id="c25"><span class="title">Lower term label</span><div class="remove hideable"><button>X</button></div></th> 
-                                </xsl:if>  
-                                
-                                <xsl:if test="$termCouplingCount &gt; 0">
-                                  <th id="c26"><span class="title">Lower coupling</span><div class="remove hideable"><button>X</button></div></th>   
-                                </xsl:if>
-                                
-                                <xsl:if test="$stateDescriptionCount &gt; 0">
-                                    <th id="c27"><span class="title">Upper state description</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$stateRefCount &gt; 0">
-                                    <th id="c28"><span class="title">Upper state source</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>   
-                                
-                                <xsl:if test="$stateEnergyCount &gt; 0">
-                                    <th id="c29"><span class="title">Upper energy(<xsl:value-of select="$stateEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$ionizationEnergyCount &gt; 0">
-                                    <th id="c30"><span class="title">Upper ionization(<xsl:value-of select="$ionizationEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$lifeTimeCount &gt; 0">
-                                    <th id="c31"><span class="title">Upper lifetime</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$statisticalWeightCount &gt; 0">
-                                    <th id="c32"><span class="title">Upper statistical weight</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$parityCount &gt; 0">
-                                    <th id="c33"><span class="title">Upper parity</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$totalAngularMomentumCount &gt; 0">    
-                                    <th id="c34"><span class="title">Upper total angular momentum</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$kappaCount &gt; 0">    
-                                    <th id="c35"><span class="title">Upper kappa</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>  
-                                
-                                <xsl:if test="$hyperfineMomentumCount &gt; 0">   
-                                    <th id="c36"><span class="title">Upper hyperfine momentum</span><div class="remove hideable"><button>X</button></div></th>
-                                </xsl:if>
-                                
-                                <xsl:if test="$magneticQuantumNumberCount &gt; 0">
-                                    <th id="c37"><span class="title">Upper magnetic quantum number</span><div class="remove hideable"><button>X</button></div></th>  
-                                </xsl:if>
-                                
-                                <xsl:if test="$mixingCoefficientCount &gt; 0">
-                                    <th id="c38"><span class="title">Upper mixing coeff</span><div class="remove hideable"><button>X</button></div></th>      
-                                </xsl:if>
-                                
-                                <xsl:if test="$configurationLabelCount &gt; 0">
-                                    <th id="c39"><span class="title">Upper configuration</span><div class="remove hideable"><button>X</button></div></th>   
-                                </xsl:if>
-                                
-                                <xsl:if test="$termLabelCount &gt; 0">
-                                    <th id="c40"><span class="title">Upper term label</span><div class="remove hideable"><button>X</button></div></th>   
-                                </xsl:if>
-                                
-                                <xsl:if test="$termCouplingCount &gt; 0">
-                                  <th id="c41"><span class="title">Upper coupling</span><div class="remove hideable"><button>X</button></div></th>   
-                                </xsl:if>
-                            </tr>
-                        </thead>
-                        <tbody>    
-                            <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition">
-                                <xsl:call-template name="fillTransitionTable">
-                                    <xsl:with-param name="radTran" select="."/>
-                                </xsl:call-template>
-                            </xsl:for-each>     
-                        </tbody>        
-                    </table>
-                </div>
-                <div class="hidden" id="sources_text">
-                    <xsl:for-each select="/xsams:XSAMSData/xsams:Sources/xsams:Source">
-                        <xsl:call-template name="getSourcesAsText">
-                            <xsl:with-param name="source" select="."/>
-                        </xsl:call-template>
-                    </xsl:for-each>
-                </div>
-            <script type="text/javascript" src="/js/jquery.js"></script>
-            <script type="text/javascript" src="/js/ajax_settings.js"></script>
-            <script type="text/javascript" src="/js/atomic_columns.js"></script>
-            <script type="text/javascript" src="/js/samp.js"></script>
-            <script type="text/javascript" src="/js/jquery.tablesorter.min.js"></script>
-            <script type="text/javascript" src="/js/xsl_transform.js"></script>
-            </body>  	
+                <th id="c24"><span class="title">Upper state description</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c25"><span class="title">Upper energy(<xsl:value-of select="$stateEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c26"><span class="title">Upper ionization(<xsl:value-of select="$ionizationEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c27"><span class="title">Upper lifetime</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c28"><span class="title">Upper statistical weight</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c29"><span class="title">Upper parity</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c30"><span class="title">Upper total angular momentum</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c31"><span class="title">Upper kappa</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c32"><span class="title">Upper hyperfine momentum</span><div class="remove hideable"><button>X</button></div></th>
+                <th id="c33"><span class="title">Upper magnetic quantum number</span><div class="remove hideable"><button>X</button></div></th>  
+                <th id="c34"><span class="title">Upper mixing coeff</span><div class="remove hideable"><button>X</button></div></th>      
+                <th id="c35"><span class="title">Upper configuration</span><div class="remove hideable"><button>X</button></div></th>   
+                <th id="c36"><span class="title">Upper term</span><div class="remove hideable"><button>X</button></div></th>   
 
-        </html>
-    </xsl:template>
-    
-    <!-- rows in source table -->
-  <xsl:template name="fillSourcesTable">
-    <xsl:param name="source"/>
-    <xsl:if test="contains($source/xsams:Comments,'is a self-reference') = false()">
-      <xsl:variable name="sourceId" select="$source/@sourceID"/>
-      <xsl:variable name="sourceUri" select="$source/xsams:UniformResourceIdentifier"/>
-      <tr>
-        <td>
-          <a name="{$sourceId}"><xsl:value-of select="$sourceId"/></a>
-        </td>
-        <td>
-          <xsl:value-of select="$source/xsams:Title"/>
-        </td>
-        <td>
-          <xsl:value-of select="$source/xsams:Category"/>
-          <xsl:if test="count($source/xsams:SourceName) &gt; 0">
-            : <xsl:value-of select="$source/xsams:SourceName"/>
-          </xsl:if>
-          <xsl:if test="count($source/xsams:Volume) &gt; 0">
-            ( Vol : <xsl:value-of select="$source/xsams:Volume"/>
-            <xsl:if test="count($source/xsams:PageBegin) &gt; 0">
-              , Page Begin : <xsl:value-of select="$source/xsams:PageBegin"/>
-            </xsl:if>
-            <xsl:if test="count($source/xsams:PageEnd) &gt; 0">
-              , Page End : <xsl:value-of select="$source/xsams:PageEnd"/>
-            </xsl:if>
-             )
-          </xsl:if>
-        </td>
-        <td>
-          <xsl:for-each select="$source/xsams:Authors/xsams:Author"><xsl:value-of select="xsams:Name"/>;
-                    </xsl:for-each>
-        </td>
-        <td>
-          <xsl:value-of select="$source/xsams:Year"/>
-        </td>
-        <td>
-          <a href="{$sourceUri}">
-            <xsl:value-of select="$source/xsams:UniformResourceIdentifier"/>
-          </a>
-        </td>
-      </tr>
-    </xsl:if>
-  </xsl:template>
-    
-    <!--  -->
-    <xsl:template name="getSourcesAsText">
-        <xsl:param name="source"/>
-        <xsl:variable name="sourceId" select="$source/@sourceID"/>
-        <xsl:variable name="sourceUri" select="$source/xsams:UniformResourceIdentifier"/>
-        <xsl:if test="contains($source/xsams:Comments,'is a self-reference') = false()">
-#Source:<xsl:value-of select="$sourceId"/>,<xsl:value-of select="$source/xsams:Title"/>, <xsl:value-of select="$source/xsams:Category"/>, <xsl:value-of select="$source/xsams:SourceName"/>,<xsl:for-each select="$source/xsams:Authors/xsams:Author"><xsl:value-of select="xsams:Name" />;</xsl:for-each>,<xsl:value-of select="$source/xsams:Year"/>,<xsl:value-of select="$source/xsams:UniformResourceIdentifier"/>
-        </xsl:if>
-    </xsl:template>
-    
-    <!-- rows in transitions table -->
-    <xsl:template name="fillTransitionTable">
-        <xsl:param name="radTran"/>
-        <xsl:variable name="lowerStateId" select="$radTran/xsams:LowerStateRef"/>
-        <xsl:variable name="upperStateId" select="$radTran/xsams:UpperStateRef"/>
-        <xsl:variable name="lowerState" select="key('atomicState', $lowerStateId)"/>
-        <xsl:variable name="upperState" select="key('atomicState', $upperStateId)"/>
+            </tr>
+            </thead>
+            <tbody>
+        <!-- end html -->
         
-        <tr class="table-line">          
-            <td data-columnid="c1"><input type="checkbox" checked="checked" class="keep_line"/></td>
-            <td data-columnid="c2">
-                <a href="http://webbook.nist.gov/cgi/cbook.cgi?Units=SI&amp;InChI={$lowerState/../xsams:InChIKey}">
-                <xsl:value-of select="$lowerState/../../../xsams:ChemicalElement/xsams:ElementSymbol"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="1 + $lowerState/../xsams:IonCharge"/>
-                </a>                
-            </td>
-            
-            <td data-columnid="c3">
-                <xsl:value-of select='format-number($radTran/xsams:EnergyWavelength/xsams:Wavelength/xsams:Value, "###0000.0000", "fixnan")'/>
+        <xsl:apply-templates/>
+        
+        
+        <!-- start html -->
+        <!-- close all tags -->
+        </tbody>
+        </table>
+    </div>
+    </body>  	
+	</html>
+	<!-- end html -->
+	
+	
+	</xsl:template>
+	<xsl:template match="xsams:RadiativeTransition">
+		<xsl:variable name="lowerStateId" select="xsams:LowerStateRef"/>
+		<xsl:variable name="upperStateId" select="xsams:UpperStateRef"/>
+		<xsl:variable name="lowerState" select="key('atomicState', $lowerStateId)"/>
+		<xsl:variable name="upperState" select="key('atomicState', $upperStateId)"/>
+		
+		<!-- fill html table -->
+		<tr class="table-line">
+            <td><input type="checkbox" checked="checked" class="keep_line"/></td>
+			<td>
+				<xsl:value-of select="$lowerState/../../../xsams:ChemicalElement/xsams:ElementSymbol"/>
+				<xsl:text> </xsl:text>
+				<xsl:value-of select="1 + $lowerState/../xsams:IonCharge"/>
+			</td>
+
+			<td>
+				<xsl:value-of select="$lowerState/../../../xsams:Isotope/xsams:IsotopeParameters/xsams:MassNumber"/>
+			</td>
+
+			<td>
+				<xsl:value-of select='format-number(./xsams:EnergyWavelength/xsams:Wavelength/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number(./xsams:EnergyWavelength/xsams:Wavenumber/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number(./xsams:EnergyWavelength/xsams:Energy/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number(./xsams:EnergyWavelength/xsams:Frequency/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number(./xsams:Probability/xsams:TransitionProbabilityA/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>			
+			
+			<td>
+				<xsl:value-of select='format-number(./xsams:Probability/xsams:OscillatorStrength/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>	
+			
+			<td>
+				<xsl:value-of select='format-number(./xsams:Probability/xsams:WeightedOscillatorStrength/xsams:Value, "###0000.0000", "fixnan")'/>
+			</td>	
+            
+			<td>
+				<xsl:value-of select='$lowerState/xsams:Description'/>
+			</td>           
+
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:StateEnergy/xsams:Value, "00.0000", "fixnan")'/>
+			</td>
+
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:IonizationEnergy/xsams:Value, "00.0000", "fixnan")'/>
+			</td>
+
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:LifeTime/xsams:Value, "00.0000", "fixnan")'/>				
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:StatisticalWeight, "00.0000", "fixnan")'/>
+			</td>			
+			
+			<td>
+				<xsl:value-of select='$lowerState/xsams:AtomicQuantumNumbers/xsams:Parity'/>				
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicQuantumNumbers/xsams:TotalAngularMomentum, "0.0", "fixnan")'/>				
+			</td>						
+			
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicQuantumNumbers/xsams:Kappa, "0.0", "fixnan")'/>				
+			</td>			
+			<td>
+				<xsl:value-of select='format-number($lowerState/xsams:AtomicQuantumNumbers/xsams:HyperfineMomentum, "0.0", "fixnan")'/>				
+			</td>	
+					
+			<td>
+				<xsl:value-of select='$lowerState/xsams:AtomicQuantumNumbers/xsams:MagneticQuantumNumber'/>				
+			</td>	
+            <td>
+                <xsl:call-template name="mixingCoeff">
+                    <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
+                </xsl:call-template>
             </td>
-            
-            <xsl:choose>
-                <xsl:when test="$radiativeTransitionRefCount &gt; 0">     
-                    <xsl:variable name="sourceId" select="$radTran/xsams:SourceRef"/>
-                    <td data-columnid="c4"><a href="#{$sourceId}"><xsl:value-of select="$sourceId"/></a></td>
-                </xsl:when>        
-                <xsl:when test="$wavelengthRefCount &gt; 0">     
-                    <xsl:variable name="sourceId" select="$radTran/xsams:EnergyWavelength/xsams:Wavelength/xsams:SourceRef"/>
-                    <td data-columnid="c4"><a href="#{$sourceId}"><xsl:value-of select="$sourceId"/></a></td>
-                </xsl:when>   
-            </xsl:choose>
-            
-            <xsl:if test="$wavenumberCount &gt; 0">
-                <td data-columnid="c5">
-                    <xsl:value-of select='format-number($radTran/xsams:EnergyWavelength/xsams:Wavenumber/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$energyCount &gt; 0">
-                <td data-columnid="c6">
-                    <xsl:value-of select='format-number($radTran/xsams:EnergyWavelength/xsams:Energy/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$frequencyCount &gt; 0">
-                <td data-columnid="c7">
-                    <xsl:value-of select='format-number($radTran/xsams:EnergyWavelength/xsams:Frequency/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$transitionProbabilityCount &gt; 0">
-                <td data-columnid="c8">
-                    <xsl:value-of select='format-number($radTran/xsams:Probability/xsams:TransitionProbabilityA/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>			
-            </xsl:if>
-            
-            <xsl:if test="$oscillatorStrengthCount &gt; 0">
-                <td data-columnid="c9">
-                    <xsl:value-of select='format-number($radTran/xsams:Probability/xsams:OscillatorStrength/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>	
-            </xsl:if>
-            
-            <xsl:if test="$weightedOscillatorStrengthCount &gt; 0">
-                <td data-columnid="c10">
-                    <xsl:value-of select='format-number($radTran/xsams:Probability/xsams:WeightedOscillatorStrength/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>	
-            </xsl:if>            
+            <td>
+                <xsl:call-template name="configuration">
+                    <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
+                </xsl:call-template>
+			</td>     
+            <td>
+                <xsl:call-template name="term">
+                    <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
+                </xsl:call-template>
+			</td>  	
+            
+			<td>
+				<xsl:value-of select='$upperState/xsams:Description'/>
+			</td>   
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:StateEnergy/xsams:Value, "00.0000", "fixnan")'/>
+			</td>
 
-            <xsl:if test="$log10WeightedOscillatorStrengthCount &gt; 0">
-                <td data-columnid="c11">
-                    <xsl:value-of select='format-number($radTran/xsams:Probability/xsams:Log10WeightedOscillatorStrength/xsams:Value, "###0000.0000", "fixnan")'/>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$stateDescriptionCount &gt; 0">
-                <td data-columnid="c12">
-                    <xsl:value-of select='$lowerState/xsams:Description'/>
-                </td>      
-            </xsl:if>     
-            
-            <xsl:if test="$stateRefCount &gt; 0">
-                <xsl:variable name="sourceId" select="$lowerState/xsams:SourceRef"/>
-                <td data-columnid="c13"><a href="#{$sourceId}"><xsl:value-of select="$sourceId"/></a></td>
-            </xsl:if>               
-            
-            <xsl:if test="$stateEnergyCount &gt; 0">
-                <td data-columnid="c14">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:StateEnergy/xsams:Value, "00.0000", "fixnan")'/>
-                </td>
-            </xsl:if>     
-            
-            <xsl:if test="$ionizationEnergyCount &gt; 0">
-                <td data-columnid="c15">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:IonizationEnergy/xsams:Value, "00.0000", "fixnan")'/>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$lifeTimeCount &gt; 0">
-                <td data-columnid="c16">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:LifeTime/xsams:Value, "00.0000", "fixnan")'/>				
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$statisticalWeightCount &gt; 0">
-                <td data-columnid="c17">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicNumericalData/xsams:StatisticalWeight, "00.0000", "fixnan")'/>
-                </td>			
-            </xsl:if>
-            
-            <xsl:if test="$parityCount &gt; 0">
-                <td data-columnid="c18">
-                    <xsl:value-of select='$lowerState/xsams:AtomicQuantumNumbers/xsams:Parity'/>				
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$totalAngularMomentumCount &gt; 0">
-                <td data-columnid="c19">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicQuantumNumbers/xsams:TotalAngularMomentum, "0.0", "fixnan")'/>				
-                </td>						
-            </xsl:if>
-            
-            <xsl:if test="$kappaCount &gt; 0">   
-                <td data-columnid="c20">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicQuantumNumbers/xsams:Kappa, "0.0", "fixnan")'/>				
-                </td>		
-            </xsl:if>
-            
-            <xsl:if test="$hyperfineMomentumCount &gt; 0">   	
-                <td data-columnid="c21">
-                    <xsl:value-of select='format-number($lowerState/xsams:AtomicQuantumNumbers/xsams:HyperfineMomentum, "0.0", "fixnan")'/>				
-                </td>	
-            </xsl:if>		
-            
-            <xsl:if test="$magneticQuantumNumberCount &gt; 0">
-                <td data-columnid="c22">
-                    <xsl:value-of select='$lowerState/xsams:AtomicQuantumNumbers/xsams:MagneticQuantumNumber'/>				
-                </td>	
-            </xsl:if>
-            
-            <xsl:if test="$mixingCoefficientCount &gt; 0">
-                <td data-columnid="c23">
-                    <xsl:call-template name="mixingCoeff">
-                        <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$configurationLabelCount &gt; 0"> 
-                <td data-columnid="c24">
-                    <xsl:call-template name="configuration">
-                        <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>    
-            </xsl:if>
-            
-            <xsl:if test="$termLabelCount &gt; 0"> 
-                <td data-columnid="c25">
-                    <xsl:call-template name="term">
-                        <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>  
-            </xsl:if>	
-            
-            <xsl:if test="$termCouplingCount &gt; 0">    
-                <td data-columnid="c26">
-                    <xsl:call-template name="coupling">
-                        <xsl:with-param name="AtomicComposition" select="$lowerState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>  	
-            </xsl:if>            
-            
-            <xsl:if test="$stateDescriptionCount &gt; 0">
-                <td data-columnid="c27">
-                    <xsl:value-of select='$upperState/xsams:Description'/>
-                </td>  
-            </xsl:if>	
-            
-            <xsl:if test="$stateRefCount &gt; 0">
-                <xsl:variable name="sourceId" select="$upperState/xsams:SourceRef"/>
-                <td data-columnid="c28"><a href="#{$sourceId}"><xsl:value-of select="$sourceId"/></a></td>
-            </xsl:if>          
-            
-            <xsl:if test="$stateEnergyCount &gt; 0">
-                <td data-columnid="c29">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:StateEnergy/xsams:Value, "00.0000", "fixnan")'/>
-                </td>
-            </xsl:if>	
-            
-            <xsl:if test="$ionizationEnergyCount &gt; 0">
-                <td data-columnid="c30">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:IonizationEnergy/xsams:Value, "00.0000", "fixnan")'/>
-                </td>
-            </xsl:if>	
-            
-            <xsl:if test="$lifeTimeCount &gt; 0">
-                <td data-columnid="c31">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:LifeTime/xsams:Value, "00.0000", "fixnan")'/>
-                </td>
-            </xsl:if>	
-            
-            <xsl:if test="$statisticalWeightCount &gt; 0">
-                <td data-columnid="c32">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:StatisticalWeight, "00.0000", "fixnan")'/>
-                </td>
-            </xsl:if>	
-            
-            <xsl:if test="$parityCount &gt; 0">
-                <td data-columnid="c33">
-                    <xsl:value-of select='$upperState/xsams:AtomicQuantumNumbers/xsams:Parity'/>				
-                </td>
-            </xsl:if>	
-            
-            <xsl:if test="$totalAngularMomentumCount &gt; 0">
-                <td data-columnid="c34">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicQuantumNumbers/xsams:TotalAngularMomentum, "0.0", "fixnan")'/>				
-                </td>
-            </xsl:if>							
-            <xsl:if test="$kappaCount &gt; 0">
-                <td data-columnid="c35">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicQuantumNumbers/xsams:Kappa, "0.0", "fixnan")'/>				
-                </td>
-            </xsl:if>		
-            <xsl:if test="$hyperfineMomentumCount &gt; 0">			
-                <td data-columnid="c36">
-                    <xsl:value-of select='format-number($upperState/xsams:AtomicQuantumNumbers/xsams:HyperfineMomentum, "0.0", "fixnan")'/>				
-                </td>	
-            </xsl:if>
-            
-            <xsl:if test="$magneticQuantumNumberCount &gt; 0">				
-                <td data-columnid="c37">
-                    <xsl:value-of select='$upperState/xsams:AtomicQuantumNumbers/xsams:MagneticQuantumNumber'/>				
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$mixingCoefficientCount &gt; 0">	
-                <td data-columnid="c38">
-                    <xsl:call-template name="mixingCoeff">
-                        <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>
-            </xsl:if>
-            
-            <xsl:if test="$configurationLabelCount &gt; 0">
-                <td data-columnid="c39">
-                    <xsl:call-template name="configuration">
-                        <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>  
-            </xsl:if>
-            
-            <xsl:if test="$termLabelCount &gt; 0">    
-                <td data-columnid="c40">
-                    <xsl:call-template name="term">
-                        <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>  	
-            </xsl:if>
-            
-            <xsl:if test="$termCouplingCount &gt; 0">    
-                <td data-columnid="c41">
-                    <xsl:call-template name="coupling">
-                        <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
-                    </xsl:call-template>
-                </td>  	
-            </xsl:if>
-        </tr>		
-    </xsl:template>
-    
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:IonizationEnergy/xsams:Value, "00.0000", "fixnan")'/>
+			</td>
+
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:LifeTime/xsams:Value, "00.0000", "fixnan")'/>
+			</td>
+
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicNumericalData/xsams:StatisticalWeight, "00.0000", "fixnan")'/>
+			</td>
+			
+			<td>
+				<xsl:value-of select='$upperState/xsams:AtomicQuantumNumbers/xsams:Parity'/>				
+			</td>
+			
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicQuantumNumbers/xsams:TotalAngularMomentum, "0.0", "fixnan")'/>				
+			</td>						
+			
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicQuantumNumbers/xsams:Kappa, "0.0", "fixnan")'/>				
+			</td>			
+			<td>
+				<xsl:value-of select='format-number($upperState/xsams:AtomicQuantumNumbers/xsams:HyperfineMomentum, "0.0", "fixnan")'/>				
+			</td>					
+			<td>
+				<xsl:value-of select='$upperState/xsams:AtomicQuantumNumbers/xsams:MagneticQuantumNumber'/>				
+			</td>	
+            <td>
+                <xsl:call-template name="mixingCoeff">
+                    <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
+                </xsl:call-template>
+            </td>
+            <td>
+                <xsl:call-template name="configuration">
+                    <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
+                </xsl:call-template>
+			</td>      
+            <td>
+                <xsl:call-template name="term">
+                    <xsl:with-param name="AtomicComposition" select="$upperState/xsams:AtomicComposition" />
+                </xsl:call-template>
+			</td>  	
+		</tr>	
+	
+	</xsl:template>
     <xsl:template name="configuration">
         <xsl:param name="AtomicComposition"/>                    
-        <xsl:for-each select="$AtomicComposition/xsams:Component">
-            <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
-            <xsl:if test="position() = 1">
-                <xsl:value-of select="./xsams:Configuration/xsams:ConfigurationLabel" />
-            </xsl:if>
-        </xsl:for-each>
+                 <xsl:for-each select="$AtomicComposition/xsams:Component">
+                <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
+                    <xsl:if test="position() = 1">
+                        <xsl:value-of select="./xsams:Configuration/xsams:ConfigurationLabel" />
+                    </xsl:if>
+                </xsl:for-each>
     </xsl:template>
     
     <xsl:template name="mixingCoeff">
         <xsl:param name="AtomicComposition"/>                    
-        <xsl:for-each select="$AtomicComposition/xsams:Component">
-            <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
-            <xsl:if test="position() = 1">
-                <xsl:value-of select="./xsams:MixingCoefficient" />
-            </xsl:if>
-        </xsl:for-each>
+                 <xsl:for-each select="$AtomicComposition/xsams:Component">
+                <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
+                    <xsl:if test="position() = 1">
+                        <xsl:value-of select="./xsams:MixingCoefficient" />
+                    </xsl:if>
+                </xsl:for-each>
     </xsl:template>
     
     <xsl:template name="term">
         <xsl:param name="AtomicComposition"/>                    
-        <xsl:for-each select="$AtomicComposition/xsams:Component">
-            <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
-            <xsl:if test="position() = 1">
-                <xsl:value-of select="./xsams:Term/xsams:TermLabel" />
-            </xsl:if>
-        </xsl:for-each>
-    </xsl:template>
-    
-    <xsl:template name="coupling">
-        <xsl:param name="AtomicComposition"/>                    
-        <xsl:for-each select="$AtomicComposition/xsams:Component">
-            <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
-            <xsl:if test="position() = 1">
-              <xsl:if test="./xsams:Term/xsams:LS">L=<xsl:value-of select="./xsams:Term/xsams:LS/xsams:L/xsams:Value" /> S=<xsl:value-of select="./xsams:Term/xsams:LS/xsams:S" />
-                <xsl:if test="./xsams:Term/xsams:LS/xsams:Multiplicity"> Multiplicity=<xsl:value-of select="./xsams:Term/xsams:LS/xsams:Multiplicity" /></xsl:if>
-                <xsl:if test="./xsams:Term/xsams:LS/xsams:Seniority"> Seniority=<xsl:value-of select="./xsams:Term/xsams:LS/xsams:Seniority" /></xsl:if>
-              </xsl:if>
-              <xsl:if test="./xsams:Term/xsams:jj"><xsl:for-each select="./xsams:Term/xsams:jj/xsams:j"> j=<xsl:value-of select="."/></xsl:for-each></xsl:if>
-              <xsl:if test="./xsams:Term/xsams:J1J2"><xsl:for-each select="./xsams:Term/xsams:J1J2/xsams:j"> j=<xsl:value-of select="."/></xsl:for-each></xsl:if>
-              <xsl:if test="./xsams:Term/xsams:jK">
-                <xsl:if test="./xsams:Term/xsams:jK/xsams:j"> j=<xsl:value-of select="./xsams:Term/xsams:jK/xsams:j" /></xsl:if>
-                <xsl:if test="./xsams:Term/xsams:jK/xsams:S2"> S2=<xsl:value-of select="./xsams:Term/xsams:jK/xsams:S2" /></xsl:if> K=<xsl:value-of select="./xsams:Term/xsams:jK/xsams:K" />
-              </xsl:if>
-              <xsl:if test="./xsams:Term/xsams:LK">L=<xsl:value-of select="./xsams:Term/xsams:LK/xsams:L/xsams:Value" /> K=<xsl:value-of select="./xsams:Term/xsams:LK/xsams:K" />
-                <xsl:if test="./xsams:Term/xsams:LK/xsams:S2"> S2=<xsl:value-of select="./xsams:Term/xsams:LK/xsams:S2" /></xsl:if>             
-              </xsl:if>
-            </xsl:if>
-        </xsl:for-each>
+                 <xsl:for-each select="$AtomicComposition/xsams:Component">
+                <xsl:sort select="xsams:MixingCoefficient" order="descending" data-type="number" />
+                    <xsl:if test="position() = 1">
+                        <xsl:value-of select="./xsams:Term/xsams:TermLabel" />
+                    </xsl:if>
+                </xsl:for-each>
     </xsl:template>
-        
-    <xsl:template match="text()|@*"/>
     
-    <xsl:template match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="text/text()" name="tokenize">
-        <xsl:param name="text" select="."/>
-        <xsl:param name="separator" select="'-'"/>
-        <xsl:choose>
-            <xsl:when test="not(contains($text, $separator))">
-                <item>
-                    <xsl:value-of select="normalize-space($text)"/>
-                </item>
-            </xsl:when>
-            <xsl:otherwise>
-                <item>
-                    <xsl:value-of select="normalize-space(substring-before($text, $separator))"/>
-                </item>
-                <xsl:call-template name="tokenize">
-                    <xsl:with-param name="text" select="substring-after($text, $separator)"/>
-                </xsl:call-template>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>     
+	<xsl:template match="text()|@*"/>
 </xsl:stylesheet>
+
diff --git a/static/xsl/molecularxsams2html.xsl b/static/xsl/molecularxsams2html.xsl
index 9fcfcfe..1fad049 100644
--- a/static/xsl/molecularxsams2html.xsl
+++ b/static/xsl/molecularxsams2html.xsl
@@ -6,12 +6,15 @@
   <xsl:key name="molecularState" match="/xsams:XSAMSData/xsams:Species/xsams:Molecules/xsams:Molecule/xsams:MolecularState" use="@stateID"/>
   <!-- name of queried node -->
   <xsl:variable name="requestedNode" select="/xsams:XSAMSData/xsams:Sources/xsams:Source/xsams:Comments[contains(.,'is a self-reference')]/../@sourceID"/>
-  <xsl:variable name="radiativeTransitionRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:SourceRef)"/>
-  <xsl:variable name="wavelengthRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength/xsams:SourceRef)"/>
-  <xsl:variable name="wavelengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength)"/>
-  <xsl:variable name="wavenumberCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavenumber)"/>
-  <xsl:variable name="energyCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Energy)"/>
-  <xsl:variable name="frequencyCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Frequency)"/>
+  <xsl:variable name="radiativeTransitionRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:SourceRef)" />
+  <xsl:variable name="wavelengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength)" />    
+  <xsl:variable name="wavelengthRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength/xsams:SourceRef)" />    
+  <xsl:variable name="wavenumberCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavenumber)" />
+  <xsl:variable name="wavenumberRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavenumber/xsams:SourceRef)" />
+  <xsl:variable name="energyCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Energy)" />
+  <xsl:variable name="energyRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Energy/xsams:SourceRef)" />
+  <xsl:variable name="frequencyCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Frequency)" />
+  <xsl:variable name="frequencyRefCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Frequency/xsams:SourceRef)" />
   <xsl:variable name="transitionProbabilityCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:TransitionProbabilityA)"/>
   <xsl:variable name="oscillatorStrengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:OscillatorStrength)"/>
   <xsl:variable name="weightedOscillatorStrengthCount" select="count(/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:Probability/xsams:WeightedOscillatorStrength)"/>
@@ -24,13 +27,42 @@
   <xsl:variable name="chemicalNameCount" select="count(//xsams:ChemicalName)"/>
   <xsl:variable name="stoichiometricFormulaCount" select="count(//xsams:StoichiometricFormula)"/>
   <xsl:variable name="ordinaryStructuralFormulaCount" select="count(//xsams:OrdinaryStructuralFormula)"/>
+  
   <xsl:variable name="stateEnergyUnit">
     <xsl:for-each select="/xsams:XSAMSData/xsams:Species/xsams:Molecules/xsams:Molecule/xsams:MolecularState/xsams:MolecularStateCharacterisation/xsams:StateEnergy/xsams:Value/@units">
       <xsl:if test="position()=1">
         <xsl:value-of select="."/>
       </xsl:if>
-    </xsl:for-each>
+    </xsl:for-each>    
   </xsl:variable>
+
+
+  <xsl:variable name="wavelengthUnit">
+      <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavelength/xsams:Value/@units">
+          <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+      </xsl:for-each>
+  </xsl:variable>  
+
+  <xsl:variable name="transitionEnergyUnit">
+      <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Energy/xsams:Value/@units">
+          <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+      </xsl:for-each>
+  </xsl:variable>  
+
+  <xsl:variable name="wavenumberUnit">
+      <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Wavenumber/xsams:Value/@units">
+          <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+      </xsl:for-each>
+  </xsl:variable>  
+
+  <xsl:variable name="frequencyUnit">
+      <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition/xsams:EnergyWavelength/xsams:Frequency/xsams:Value/@units">
+          <xsl:if test="position()=1"><xsl:value-of select="."/></xsl:if>
+      </xsl:for-each>
+  </xsl:variable>    
+
+
+  
   <xsl:template match="/xsams:XSAMSData">
     <!--  start html page-->
     <html xmlns="http://www.w3.org/1999/xhtml" lang="EN" dir="ltr">
@@ -40,15 +72,21 @@
       </head>
       <body>
         <div id="page_actions">
-          <fieldset title="Actions">
-            <legend>Actions</legend>
-            <button id="reset">Reset page</button>
-            <button id="csv_export">Show As Csv</button>
-            <input type="submit" id="votable_samp" value="Send with samp"/>
-          </fieldset>
+            <fieldset title="Actions">
+                <legend>Menu</legend>                        
+                <button id="csv_export">Export as CSV</button>
+                <button id="json_export">Export as JSON</button>
+                <button id="votable_export">Export as VOTable</button>
+                <input type="submit" id="votable_samp" value="Send with samp" />
+                <button id="reset" >Reset page</button>
+            </fieldset>
         </div>
-        <div>
-          <h1>Sources</h1>
+        <div id="page_content">
+          <div>
+              <!-- ascii export area -->
+              <textarea id="result_export" rows="50" cols="150"></textarea>
+          </div>
+          <strong>Sources</strong>
           <!--sources table -->
           <table id="sources" class="tablesorter">
             <thead>
@@ -69,213 +107,249 @@
               </xsl:for-each>
             </tbody>
           </table>
-        </div>
-        <div id="title">
-          <h1>Results from <span id="queried_node"><xsl:value-of select="substring(substring-before($requestedNode, '-'), 2)"/></span> VAMDC node</h1>
-        </div>
-        <div id="loader">
-          <img alt="loading" src="/img/loader_anim.gif"/>
-          <span> Please wait ... </span>
-        </div>
-        <div>
-          <!-- ascii export area -->
-          <pre id="result_ascii"/>
-        </div>
-        <div>
-          <!-- transitions table -->
-          <table id="transitions" class="tablesorter">
-            <thead>
-              <tr>
-                <th id="c1">
-                  <span class="title"/>
-                  <button id="select_all_lines">Unselect all</button>
-                </th>
-                <xsl:if test="$chemicalNameCount &gt; 0">
-                  <th id="c2">
-                    <span class="title">Chemical name</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$ionChargeCount &gt; 0">
-                  <th id="c3">
-                    <span class="title">Ion charge</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$stoichiometricFormulaCount &gt; 0">
-                  <th id="c4">
-                    <span class="title">Stoichiometric formula</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$ordinaryStructuralFormulaCount &gt; 0">
-                  <th id="c5">
-                    <span class="title">Ordinary structural formula</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$wavelengthCount &gt; 0">
-                  <th id="c6">
-                    <span class="title">Wavelength(A)</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$radiativeTransitionRefCount &gt; 0 or $wavelengthRefCount &gt; 0">
-                  <th id="c7">
-                    <span class="title">Transition reference</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$wavenumberCount &gt; 0">
-                  <th id="c8">
-                    <span class="title">Wavenumber</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$energyCount &gt; 0">
-                  <th id="c9">
-                    <span class="title">Energy</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$frequencyCount &gt; 0">
-                  <th id="c10">
-                    <span class="title">Frequency</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$transitionProbabilityCount &gt; 0">
-                  <th id="c11">
-                    <span class="title">A</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$oscillatorStrengthCount &gt; 0">
-                  <th id="c12">
-                    <span class="title">Oscillator Strength</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$weightedOscillatorStrengthCount &gt; 0">
-                  <th id="c13">
-                    <span class="title">Weighted Oscillator Strength</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$stateEnergyCount &gt; 0">
-                  <th id="c14">
-                    <span class="title">Lower energy(<xsl:value-of select="$stateEnergyUnit"/>)</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$totalStatisticalWeightCount &gt; 0">
-                  <th id="c15">
-                    <span class="title">Lower total statistical weight</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
+
+          <div id="title">
+            <strong>Results from <span id="queried_node"><xsl:value-of select="substring(substring-before($requestedNode, '-'), 2)"/></span> VAMDC node</strong>
+          </div>
+          <div id="loader">
+            <img alt="loading" src="/img/loader_anim.gif"/>
+            <span> Please wait ... </span>
+          </div>
+          <div>
+            <!-- transitions table -->
+            <table id="transitions" class="tablesorter">
+              <thead>
+                <tr>
+                  <th id="c1">
+                    <span class="title"/>
+                    <button id="select_all_lines">Unselect all</button>
                   </th>
-                </xsl:if>
-                <xsl:if test="$nuclearStatisticalWeightCount &gt; 0">
-                  <th id="c16">
-                    <span class="title">Lower nuclear statistical weight</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$parityCount &gt; 0">
-                  <th id="c17">
-                    <span class="title">Lower parity</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$caseCount &gt; 0">
-                  <th id="c18">
-                    <span class="title">Lower QNs</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$stateEnergyCount &gt; 0">
-                  <th id="c19">
-                    <span class="title">Upper energy(<xsl:value-of select="$stateEnergyUnit"/>)</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$totalStatisticalWeightCount &gt; 0">
-                  <th id="c20">
-                    <span class="title">Upper total statistical weight</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$nuclearStatisticalWeightCount &gt; 0">
-                  <th id="c21">
-                    <span class="title">Upper nuclear statistical weight</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$parityCount &gt; 0">
-                  <th id="c22">
-                    <span class="title">Upper parity</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-                <xsl:if test="$caseCount &gt; 0">
-                  <th id="c23">
-                    <span class="title">Upper QNs</span>
-                    <div class="remove hideable">
-                      <button>X</button>
-                    </div>
-                  </th>
-                </xsl:if>
-              </tr>
-            </thead>
-            <tbody>
-              <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition">
-                <xsl:call-template name="fillTransitionTable">
-                  <xsl:with-param name="radTran" select="."/>
+                  <xsl:if test="$chemicalNameCount &gt; 0">
+                    <th id="c2">
+                      <span class="title">Chemical name</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$ionChargeCount &gt; 0">
+                    <th id="c3">
+                      <span class="title">Ion charge</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$stoichiometricFormulaCount &gt; 0">
+                    <th id="c4">
+                      <span class="title">Stoichiometric formula</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$ordinaryStructuralFormulaCount &gt; 0">
+                    <th id="c5">
+                      <span class="title">Ordinary structural formula</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$wavelengthCount &gt; 0">
+                    <th id="c6" data-unit="{$wavelengthUnit}">
+                      <span class="title">Wavelength (<xsl:value-of select="$wavelengthUnit" />)</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$wavelengthRefCount &gt; 0">
+                    <th id="c7">
+                      <span class="title">Wavelength reference</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$radiativeTransitionRefCount &gt; 0">
+                    <th id="c8">
+                      <span class="title">Transition reference</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$wavenumberCount &gt; 0">
+                    <th id="c9" data-unit="{$wavenumberUnit}">
+                      <span class="title">Wavenumber</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$wavenumberRefCount &gt; 0">
+                    <th id="c10">
+                      <span class="title">Wavenumber reference</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$energyCount &gt; 0">
+                    <th id="c11" data-unit="{$transitionEnergyUnit}">
+                      <span class="title">Energy</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$energyRefCount &gt; 0">
+                    <th id="c12">
+                      <span class="title">Energy reference</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$frequencyCount &gt; 0">
+                    <th id="c13" data-unit="{$frequencyUnit}">
+                      <span class="title">Frequency</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$frequencyRefCount &gt; 0">
+                    <th id="c14">
+                      <span class="title">Frequency reference</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>                
+                  <xsl:if test="$transitionProbabilityCount &gt; 0">
+                    <th id="c15">
+                      <span class="title">A</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$oscillatorStrengthCount &gt; 0">
+                    <th id="c16">
+                      <span class="title">Oscillator Strength</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$weightedOscillatorStrengthCount &gt; 0">
+                    <th id="c17">
+                      <span class="title">Weighted Oscillator Strength</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$stateEnergyCount &gt; 0">
+                    <th id="c18" data-unit="{$stateEnergyUnit}">
+                      <span class="title">Lower energy(<xsl:value-of select="$stateEnergyUnit"/>)</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$totalStatisticalWeightCount &gt; 0">
+                    <th id="c19">
+                      <span class="title">Lower total statistical weight</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$nuclearStatisticalWeightCount &gt; 0">
+                    <th id="c20">
+                      <span class="title">Lower nuclear statistical weight</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$parityCount &gt; 0">
+                    <th id="c21">
+                      <span class="title">Lower parity</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$caseCount &gt; 0">
+                    <th id="c22">
+                      <span class="title">Lower QNs</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$stateEnergyCount &gt; 0">
+                    <th id="c23" data-unit="{$stateEnergyUnit}">
+                      <span class="title">Upper energy(<xsl:value-of select="$stateEnergyUnit"/>)</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$totalStatisticalWeightCount &gt; 0">
+                    <th id="c24">
+                      <span class="title">Upper total statistical weight</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$nuclearStatisticalWeightCount &gt; 0">
+                    <th id="c25">
+                      <span class="title">Upper nuclear statistical weight</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$parityCount &gt; 0">
+                    <th id="c26">
+                      <span class="title">Upper parity</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                  <xsl:if test="$caseCount &gt; 0">
+                    <th id="c27">
+                      <span class="title">Upper QNs</span>
+                      <div class="remove hideable">
+                        <button>X</button>
+                      </div>
+                    </th>
+                  </xsl:if>
+                </tr>
+              </thead>
+              <tbody>
+                <xsl:for-each select="/xsams:XSAMSData/xsams:Processes/xsams:Radiative/xsams:RadiativeTransition">
+                  <xsl:call-template name="fillTransitionTable">
+                    <xsl:with-param name="radTran" select="."/>
+                  </xsl:call-template>
+                </xsl:for-each>
+              </tbody>
+            </table>
+          </div>
+          <div class="hidden" id="sources_text">
+            <xsl:for-each select="/xsams:XSAMSData/xsams:Sources/xsams:Source">
+                <xsl:call-template name="getSourcesAsText">
+                    <xsl:with-param name="source" select="."/>
                 </xsl:call-template>
-              </xsl:for-each>
-            </tbody>
-          </table>
+            </xsl:for-each>
+          </div>
         </div>
         <script type="text/javascript" src="/js/jquery.js"/>
         <script type="text/javascript" src="/js/ajax_settings.js"/>
@@ -323,13 +397,21 @@
           <xsl:value-of select="$source/xsams:Year"/>
         </td>
         <td>
-          <a href="{$sourceUri}">
+          <a href="{$sourceUri}" data-type="uri">
             <xsl:value-of select="$source/xsams:UniformResourceIdentifier"/>
           </a>
         </td>
       </tr>
     </xsl:if>
   </xsl:template>
+    <xsl:template name="getSourcesAsText">
+        <xsl:param name="source"/>
+        <xsl:variable name="sourceId" select="$source/@sourceID"/>
+        <xsl:variable name="sourceUri" select="$source/xsams:UniformResourceIdentifier"/>
+        <xsl:if test="contains($source/xsams:Comments,'is a self-reference') = false()">
+#<xsl:value-of select="$sourceId"/>::<xsl:value-of select="$source/xsams:Title"/>::<xsl:value-of select="$source/xsams:Category"/>::<xsl:value-of select="$source/xsams:SourceName"/>::<xsl:for-each select="$source/xsams:Authors/xsams:Author"><xsl:value-of select="xsams:Name" />;</xsl:for-each>,<xsl:value-of select="$source/xsams:Year"/>::<xsl:value-of select="$source/xsams:UniformResourceIdentifier"/>
+        </xsl:if>
+    </xsl:template>
   <xsl:template name="fillTransitionTable">
     <xsl:param name="radTran"/>
     <xsl:variable name="lowerStateId" select="$radTran/xsams:LowerStateRef"/>
@@ -364,106 +446,133 @@
       </xsl:if>
       <xsl:if test="$wavelengthCount &gt; 0">
         <td data-columnid="c6">
-          <xsl:value-of select="format-number($radTran/xsams:EnergyWavelength/xsams:Wavelength/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+          <xsl:value-of select="$radTran/xsams:EnergyWavelength/xsams:Wavelength[1]/xsams:Value"/>
         </td>
       </xsl:if>
-      <xsl:choose>
-        <xsl:when test="$radiativeTransitionRefCount &gt; 0">
-          <xsl:variable name="sourceId" select="$radTran/xsams:SourceRef"/>
+      <xsl:if test="$wavelengthRefCount &gt; 0">        
           <td data-columnid="c7">
-            <a href="#{$sourceId}">
-              <xsl:value-of select="$sourceId"/>
-            </a>
+            <xsl:for-each select="$radTran/xsams:EnergyWavelength/xsams:Wavelength[1]/xsams:SourceRef">
+              <xsl:call-template name="sourceLink">
+                  <xsl:with-param name="SourceRef" select="." />
+              </xsl:call-template>
+            </xsl:for-each>
           </td>
-        </xsl:when>
-        <xsl:when test="$wavelengthRefCount &gt; 0">
-          <xsl:variable name="sourceId" select="$radTran/xsams:EnergyWavelength/xsams:Wavelength/xsams:SourceRef"/>
-          <td data-columnid="c7">
-            <a href="#{$sourceId}">
-              <xsl:value-of select="$sourceId"/>
-            </a>
-          </td>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:if test="$wavenumberCount &gt; 0">
+      </xsl:if>
+      <xsl:if test="$radiativeTransitionRefCount &gt; 0">
         <td data-columnid="c8">
-          <xsl:value-of select="format-number($radTran/xsams:EnergyWavelength/xsams:Wavenumber/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+          <xsl:for-each select="$radTran/xsams:SourceRef">
+            <xsl:call-template name="sourceLink">
+                <xsl:with-param name="SourceRef" select="." />
+            </xsl:call-template>
+          </xsl:for-each>
         </td>
       </xsl:if>
-      <xsl:if test="$energyCount &gt; 0">
+      <xsl:if test="$wavenumberCount &gt; 0">
         <td data-columnid="c9">
-          <xsl:value-of select="format-number($radTran/xsams:EnergyWavelength/xsams:Energy/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+          <xsl:value-of select="$radTran/xsams:EnergyWavelength/xsams:Wavenumber[1]/xsams:Value"/>          
         </td>
       </xsl:if>
-      <xsl:if test="$frequencyCount &gt; 0">
+      <xsl:if test="$wavenumberRefCount &gt; 0">        
         <td data-columnid="c10">
-          <xsl:value-of select="format-number($radTran/xsams:EnergyWavelength/xsams:Frequency/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+          <xsl:for-each select="$radTran/xsams:EnergyWavelength/xsams:Wavenumber[1]/xsams:SourceRef">
+            <xsl:call-template name="sourceLink">
+                <xsl:with-param name="SourceRef" select="." />
+            </xsl:call-template>
+          </xsl:for-each>
         </td>
       </xsl:if>
-      <xsl:if test="$transitionProbabilityCount &gt; 0">
+      <xsl:if test="$energyCount &gt; 0">
         <td data-columnid="c11">
-          <xsl:value-of select="format-number($radTran/xsams:Probability/xsams:TransitionProbabilityA/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+          <xsl:value-of select="$radTran/xsams:EnergyWavelength/xsams:Energy[1]/xsams:Value"/>
+        </td>
+      </xsl:if>
+      <xsl:if test="$energyRefCount &gt; 0">        
+          <td data-columnid="c12">
+            <xsl:for-each select="$radTran/xsams:EnergyWavelength/xsams:Energy[1]/xsams:SourceRef">
+              <xsl:call-template name="sourceLink">
+                  <xsl:with-param name="SourceRef" select="." />
+              </xsl:call-template>
+            </xsl:for-each>
+          </td>
+      </xsl:if>
+      <xsl:if test="$frequencyCount &gt; 0">
+        <td data-columnid="c13">
+          <xsl:value-of select="$radTran/xsams:EnergyWavelength/xsams:Frequency[1]/xsams:Value"/>
+        </td>
+      </xsl:if>
+      <xsl:if test="$frequencyRefCount &gt; 0">        
+        <td data-columnid="c14">
+          <xsl:for-each select="$radTran/xsams:EnergyWavelength/xsams:Frequency[1]/xsams:SourceRef">
+            <xsl:call-template name="sourceLink">
+                <xsl:with-param name="SourceRef" select="." />
+            </xsl:call-template>
+          </xsl:for-each>
+        </td>
+      </xsl:if>
+      <xsl:if test="$transitionProbabilityCount &gt; 0">
+        <td data-columnid="c15">
+          <xsl:value-of select="$radTran/xsams:Probability/xsams:TransitionProbabilityA/xsams:Value"/>
         </td>
       </xsl:if>
       <xsl:if test="$oscillatorStrengthCount &gt; 0">
-        <td data-columnid="c12">
-          <xsl:value-of select="format-number($radTran/xsams:Probability/xsams:OscillatorStrength/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c16">
+          <xsl:value-of select="$radTran/xsams:Probability/xsams:OscillatorStrength/xsams:Value"/>          
         </td>
       </xsl:if>
       <xsl:if test="$weightedOscillatorStrengthCount &gt; 0">
-        <td data-columnid="c13">
-          <xsl:value-of select="format-number($radTran/xsams:Probability/xsams:WeightedOscillatorStrength/xsams:Value, &quot;###0000.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c17">
+          <xsl:value-of select="$radTran/xsams:Probability/xsams:WeightedOscillatorStrength/xsams:Value"/>
         </td>
       </xsl:if>
       <xsl:if test="$stateEnergyCount &gt; 0">
-        <td data-columnid="c14">
-          <xsl:value-of select="format-number($lowerState/xsams:MolecularStateCharacterisation/xsams:StateEnergy/xsams:Value, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c18">
+          <xsl:value-of select="$lowerState/xsams:MolecularStateCharacterisation/xsams:StateEnergy/xsams:Value"/>
         </td>
       </xsl:if>
       <xsl:if test="$totalStatisticalWeightCount &gt; 0">
-        <td data-columnid="c15">
-          <xsl:value-of select="format-number($lowerState/xsams:MolecularStateCharacterisation/xsams:TotalStatisticalWeight, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c19">
+          <xsl:value-of select="$lowerState/xsams:MolecularStateCharacterisation/xsams:TotalStatisticalWeight"/>
         </td>
       </xsl:if>
       <xsl:if test="$nuclearStatisticalWeightCount &gt; 0">
-        <td data-columnid="c16">
-          <xsl:value-of select="format-number($lowerState/xsams:MolecularStateCharacterisation/xsams:NuclearStatisticalWeight, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c20">
+          <xsl:value-of select="$lowerState/xsams:MolecularStateCharacterisation/xsams:NuclearStatisticalWeight"/>
         </td>
       </xsl:if>
       <xsl:if test="$parityCount &gt; 0">
-        <td data-columnid="c17">
-          <xsl:value-of select="format-number($lowerState/xsams:Parity, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c21">
+          <xsl:value-of select="$lowerState/xsams:Parity"/>
         </td>
       </xsl:if>
       <xsl:if test="$caseCount &gt; 0">
-        <td data-columnid="c18">
+        <td data-columnid="c22">
           <xsl:call-template name="case">
             <xsl:with-param name="case" select="$lowerState/xsams:Case"/>
           </xsl:call-template>
         </td>
       </xsl:if>
       <xsl:if test="$stateEnergyCount &gt; 0">
-        <td data-columnid="c19">
-          <xsl:value-of select="format-number($upperState/xsams:MolecularStateCharacterisation/xsams:StateEnergy/xsams:Value, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c23">
+          <xsl:value-of select="$upperState/xsams:MolecularStateCharacterisation/xsams:StateEnergy/xsams:Value"/>
         </td>
       </xsl:if>
       <xsl:if test="$totalStatisticalWeightCount &gt; 0">
-        <td data-columnid="c20">
-          <xsl:value-of select="format-number($upperState/xsams:MolecularStateCharacterisation/xsams:TotalStatisticalWeight, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c24">
+          <xsl:value-of select="$upperState/xsams:MolecularStateCharacterisation/xsams:TotalStatisticalWeight"/>
         </td>
       </xsl:if>
       <xsl:if test="$nuclearStatisticalWeightCount &gt; 0">
-        <td data-columnid="c21">
-          <xsl:value-of select="format-number($upperState/xsams:MolecularStateCharacterisation/xsams:NuclearStatisticalWeight, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c25">
+          <xsl:value-of select="$upperState/xsams:MolecularStateCharacterisation/xsams:NuclearStatisticalWeight"/>
         </td>
       </xsl:if>
       <xsl:if test="$parityCount &gt; 0">
-        <td data-columnid="c22">
-          <xsl:value-of select="format-number($upperState/xsams:Parity, &quot;00.0000&quot;, &quot;fixnan&quot;)"/>
+        <td data-columnid="c26">
+          <xsl:value-of select="$upperState/xsams:Parity"/>
         </td>
       </xsl:if>
       <xsl:if test="$caseCount &gt; 0">
-        <td data-columnid="c23">
+        <td data-columnid="c27">
           <xsl:call-template name="case">
             <xsl:with-param name="case" select="$upperState/xsams:Case"/>
           </xsl:call-template>
@@ -471,6 +580,20 @@
       </xsl:if>
     </tr>
   </xsl:template>
+  
+  <!-- display source in a html link -->
+  <xsl:template name="sourceLink">
+      <xsl:param name="SourceRef"/>
+      <xsl:element name="a">
+        <xsl:attribute name="href">
+          <xsl:text>#</xsl:text>
+          <xsl:value-of select="$SourceRef"/>
+        </xsl:attribute>
+        <xsl:value-of select="."/>
+      </xsl:element>
+      <xsl:text> </xsl:text>
+  </xsl:template>
+  
   <xsl:template name="case">
     <xsl:param name="case"/>
     <xsl:if test="$case/@caseID = 'dcs'">
@@ -2022,3 +2145,4 @@
     </xsl:choose>
   </xsl:template>
 </xsl:stylesheet>
+
diff --git a/static/xsl/xsams2atomichtml.xsl b/static/xsl/xsams2atomichtml.xsl
index 41324d1..5aa97aa 100644
--- a/static/xsl/xsams2atomichtml.xsl
+++ b/static/xsl/xsams2atomichtml.xsl
@@ -82,14 +82,14 @@
             <tr>
                 <th id="c1"><span class="title"></span><button id="select_all_lines">Unselect all</button></th>
                 <th id="c2"><span class="title">Spec Ion</span><div class="remove hideable"><button>X</button></div></th>
-				<th id="c2"><span class="title">Mass number</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c3"><span class="title">Wavelength(A)</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c4"><span class="title">Wavenumber</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c5"><span class="title">Energy</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c6"><span class="title">Frequency</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c7"><span class="title">A</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c8"><span class="title">Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>
-                <th id="c9"><span class="title">Weighted Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>                    
+                <th id="c9"><span class="title">Weighted Oscillator Strength</span><div class="remove hideable"><button>X</button></div></th>
+                    
                 <th id="c10"><span class="title">Lower state description</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c11"><span class="title">Lower energy(<xsl:value-of select="$stateEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
                 <th id="c12"><span class="title">Lower ionization(<xsl:value-of select="$ionizationEnergyUnit"/>)</span><div class="remove hideable"><button>X</button></div></th>
@@ -152,10 +152,6 @@
 				<xsl:value-of select="1 + $lowerState/../xsams:IonCharge"/>
 			</td>
 
-			<td>
-				<xsl:value-of select="$lowerState/../../../xsams:Isotope/xsams:IsotopeParameters/xsams:MassNumber"/>
-			</td>
-
 			<td>
 				<xsl:value-of select='format-number(./xsams:EnergyWavelength/xsams:Wavelength/xsams:Value, "###0000.0000", "fixnan")'/>
 			</td>
diff --git a/templates/index.html b/templates/index.html
index 9fa12b0..cf0536a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,6 +1,6 @@
 {% extends "vamdc.html" %}
 {% block content %}
-<p>This is a test site for various web applications for the VAMDC.</p>
+<p>This page gives access to various transformation tools for VAMDC XSAMS files.</p>
 
 <p>Please choose one of the links to the right.</p>
 
diff --git a/templates/vamdc.html b/templates/vamdc.html
index b84bf24..fdba1e1 100644
--- a/templates/vamdc.html
+++ b/templates/vamdc.html
@@ -1,9 +1,10 @@
+{% load static%}
 <!DOCTYPE html>
 <html class="" lang="en-US"><head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel='stylesheet' id='vamdc-style-css'  href='{{ STATIC_URL }}vamdc_files/style.css' type='text/css' media='all' />
+<link rel='stylesheet' id='vamdc-style-css'  href="{%static 'vamdc_files/style.css'%}" type='text/css' media='all' />
 <title>{% block title %}VAMDC{% endblock %}</title>
 {% block addheader %}{% endblock %}
 </head>
@@ -11,31 +12,45 @@
 <div class="body">
 	<div class="header">
 		<a href="http://vamdc.org/" class="site-logo">
-			<img src="{{ STATIC_URL }}vamdc_files/site-logo-223x68.png" alt="VAMDC Consortium">
+			<img src="{%static 'vamdc_files/site-logo-223x68.png'%}" alt="VAMDC Consortium">
 		</a>
 		
 	</div>
 {% block topmenu %}
 	<div class="top-menu">
 		<div class="menu-menu-principal-container">
-            <ul id="menu-menu-principal" class="menu">
-</ul></div>	</div>
+            <ul id="menu-menu-principal" class="menu">				
+			</ul>
+		</div>	
+	</div>
 {% endblock %}
 
 	<div class="main-wrapper">		
-	<div class="main-content-1">
-	<p class="page-main-title">
-		{% block headline %}VAMDC Processor{% endblock %}
-	</p>
+		<div class="main-content-1">
+			<p class="page-main-title">
+				{% block headline %}VAMDC Processor{% endblock %}
+			</p>
 
 {% block content %}
-{% endblock %}
-    
-	
-</div>
-
-
-			</div>
-			
+{% endblock %}   	
+		</div>
+		<div class="sidebar-right">
+			<strong>List of tools</strong>
+			<ul>
+                <li><a href="/applyXSL/xsams2sme/">xsams2sme</a></li>
+                <li><a href="/applyXSL/linespec/">linespec</a></li>
+                <li><a href="/applyXSL/atomicxsams2html/">atomicxsams2html</a></li>
+                <li><a href="/applyXSL/molecularxsams2html/">molecularxsams2html</a></li>
+                <li><a href="/applyXSL/collisions2html/">collisions2html</a></li>
+            </ul>
+            <strong>Links</strong>
+			<ul>
+				<li><a href="http://www.vamdc.eu">VAMDC Homepage</a></li>
+				<li><a href="http://voparis-twiki.obspm.fr/twiki/bin/view/VAMDC/">VAMDC Wiki</a></li>
+			</ul>
 		</div>
-</body></html>
+	</div>
+			
+</div>
+</body>
+</html>
diff --git a/templates/wait5.html b/templates/wait5.html
index 4d2c502..e2b680c 100644
--- a/templates/wait5.html
+++ b/templates/wait5.html
@@ -6,7 +6,7 @@
 
 
 {% block content %}
-<div style="font-size: 1.5em">
+<div>
 <p>Your result is being prepared.</p>
 <p>This page refreshes itself every 5 seconds, but feel free to refresh manually any time.</p>
 </div>