Updated some more views and cleaned up some code