Switched the methods to instance methods, changed the html to use id's rather than classes where appropriate and cleaned up some of the commenting