Modified UI and functionality to match #149
Merge branch 'controls' into develop