More clean up, adding templates
added more templates
adding click handler to template buttons
trying to fix active class on template buttons