Various edits to the views