revamped the analysis and tools templates (though tools is not showing up at the moment)