changed Users to User
reenabled layouts