Editing layouts for NonUsers and adding name to Users.