Added a few more tweaks and hooked up the tools to auto-fill the questions

Conflicts:
static/scripts/controls.js
removed index2 - cleanup