Please address the poor UI for the Form Builder

In order to save the Form builder inputs, I have to click the blue 'save' at the top right but since this is a modal I assume 'close' saves and returns to the main content. (like the way content editing saves the draft)

Option 1: Put the 2 buttons next to each other. and label them 'Cancel" and 'Save'
Option 2: Alternatively there could be a 'unsaved changes' message in the model title.

I recommend relabeling 'cancel' as that indicates 1. no data will be saved and 2. the modal will close. 3. Counter action of Cancel is 'Save'
(counter action Close is 'open')

When editing the Content there is a 'Close, but that is also bad becuase actually does create a draft and NOT close / discard but does not tell the user this. When they re-edit they are prompted that in fact hey have a draft already. which is confusing.