id various elements and comment the close tag
refactor to use angular directives