added more live templates and some clean up