Fixed user's names showing and refactoring