Use templates for analysis rendering
Changed analysis rendering, lista handling