Added names to users & updated views