some changes to ui
Merge branch 'umass_branch' into staging