Updated the views to be consistent with each other