Umass branch

I've made some changes to the UI.