controller updates for design
Merge branch 'master' of https://github.com/amt963/HTML_UI