Made a few changes to the views