Add controls and wrap in an angualr.js app; some refactoring realted to that including better variable names