Cleaned up views to make them consistent