modified User and Index views