fix same ux issues