Minor changes to views, fixed tests said changes broke, removed 'abouts'