More work on all the views