Some overall cleanup in the HTML and controller.js