As a UX suggestion in the UCI, our users are struggling with "Save and Close" because they are saying "Well I made no changes, I don't want to Save. I just want to Close".

Users from the non-UCI environment are also use to the [X] button in the top right of the form.

Can this be a UI feature that can be toggled back on?