Updated lists views and added some other stuff