Fix update user error, tweak layout