Fix up the variable naming scheme and add ability to click on the name of a variable to populate the new expression input box.