updates to resolve ux issues