Matt made a bunch of views changes