ian's update ui and fixed merge conflict
Merge branch 'master' of github.com:ianrblue/SCAS