Merge pull request #1 from jjliang/umass_branch

Umass branch
ui refinement
Merge pull request #84 from sylvia-sp/umass_branch

Umass branch