Updated the views to work correctly