cleaned up markup, templates, and js