add users index and some template refactoring