modified views and urls to resolve naming issues