Update views and naming conventions to get all views displaying