update some props to match latest ux suggestion