clean up and added backbone templates