fixed up some views, removed span on gmaps
Merge branch 'umass_branch' into staging