Various minor updates to the views