Modified all views for consistecy