Normalice the way we add handlers to dom elements
Merge branch 'js' into dev